uci: use correct sort index when reordering sections

[project/rpcd.git] / uci.c

diff --git a/uci.c b/uci.c
index 91d4ba2..17b4d89 100644 (file)
--- a/uci.c
+++ b/uci.c
@@ -204,15 +204,13 @@ rpc_uci_status(void)
 }
 
 /*
- * Setup per-session delta save directory. If the passed "sid" blob attribute
- * pointer is NULL then the precedure was not invoked through the ubus-rpc so
- * we do not perform session isolation and use the default save directory.
+ * Clear all save directories from the uci cursor and append the given path
+ * as new save directory.
  */
 static void
-rpc_uci_set_savedir(struct blob_attr *sid)
+rpc_uci_replace_savedir(const char *path)
 {
        struct uci_element *e, *tmp;
-       char path[PATH_MAX];
 
        uci_foreach_element_safe(&cursor->delta_path, tmp, e)
                free(e);
@@ -220,16 +218,30 @@ rpc_uci_set_savedir(struct blob_attr *sid)
        cursor->delta_path.prev = &cursor->delta_path;
        cursor->delta_path.next = &cursor->delta_path;
 
+       if (path)
+               uci_set_savedir(cursor, path);
+}
+
+/*
+ * Setup per-session delta save directory. If the passed "sid" blob attribute
+ * pointer is NULL then the precedure was not invoked through the ubus-rpc so
+ * we do not perform session isolation and use the default save directory.
+ */
+static void
+rpc_uci_set_savedir(struct blob_attr *sid)
+{
+       char path[PATH_MAX];
+
        if (!sid)
        {
-               uci_set_savedir(cursor, "/tmp/.uci");
+               rpc_uci_replace_savedir("/tmp/.uci");
                return;
        }
 
        snprintf(path, sizeof(path) - 1,
                 RPC_UCI_SAVEDIR_PREFIX "%s", blobmsg_get_string(sid));
 
-       uci_set_savedir(cursor, path);
+       rpc_uci_replace_savedir(path);
 }
 
 /*
@@ -956,7 +968,7 @@ rpc_uci_order(struct ubus_context *ctx, struct ubus_object *obj,
        struct blob_attr *cur;
        struct uci_package *p = NULL;
        struct uci_ptr ptr = { 0 };
-       int rem, i = 1;
+       int rem, i = 0;
 
        blobmsg_parse(rpc_uci_order_policy, __RPC_O_MAX, tb,
                      blob_data(msg), blob_len(msg));
@@ -1280,17 +1292,53 @@ rpc_uci_copy_file(const char *src, const char *target, const char *file)
                fclose(out);
 }
 
+static int
+rpc_uci_apply_access(const char *sid, glob_t *gl)
+{
+       struct stat s;
+       int i, c = 0;
+
+       if (gl->gl_pathc < 3)
+               return UBUS_STATUS_NO_DATA;
+
+       for (i = 0; i < gl->gl_pathc; i++) {
+               char *config = basename(gl->gl_pathv[i]);
+
+               if (*config == '.')
+                       continue;
+               if (stat(gl->gl_pathv[i], &s) || !s.st_size)
+                       continue;
+               if (!rpc_session_access(sid, "uci", config, "write"))
+                       return UBUS_STATUS_PERMISSION_DENIED;
+               c++;
+       }
+
+       if (!c)
+               return UBUS_STATUS_NO_DATA;
+
+       return 0;
+}
+
 static void
-rpc_uci_do_rollback(struct ubus_context *ctx, const char *sid, glob_t *gl)
+rpc_uci_do_rollback(struct ubus_context *ctx, glob_t *gl)
 {
-       int i;
+       int i, deny;
        char tmp[PATH_MAX];
 
-       if (sid) {
-               snprintf(tmp, sizeof(tmp), RPC_UCI_SAVEDIR_PREFIX "%s/", sid);
+       /* Test apply permission to see if the initiator session still exists.
+        * If it does, restore the delta files as well, else just restore the
+        * main configuration files. */
+       deny = apply_sid[0]
+               ? rpc_uci_apply_access(apply_sid, gl) : UBUS_STATUS_NOT_FOUND;
+
+       if (!deny) {
+               snprintf(tmp, sizeof(tmp), RPC_UCI_SAVEDIR_PREFIX "%s/", apply_sid);
                mkdir(tmp, 0700);
        }
 
+       /* avoid merging unrelated uci changes when restoring old configs */
+       rpc_uci_replace_savedir("/dev/null");
+
        for (i = 0; i < gl->gl_pathc; i++) {
                char *config = basename(gl->gl_pathv[i]);
 
@@ -1299,8 +1347,11 @@ rpc_uci_do_rollback(struct ubus_context *ctx, const char *sid, glob_t *gl)
 
                rpc_uci_copy_file(RPC_SNAPSHOT_FILES, RPC_UCI_DIR, config);
                rpc_uci_apply_config(ctx, config);
-               if (sid)
-                       rpc_uci_copy_file(RPC_SNAPSHOT_DELTA, tmp, config);
+
+               if (deny)
+                       continue;
+
+               rpc_uci_copy_file(RPC_SNAPSHOT_DELTA, tmp, config);
        }
 
        rpc_uci_purge_dir(RPC_SNAPSHOT_FILES);
@@ -1321,34 +1372,9 @@ rpc_uci_apply_timeout(struct uloop_timeout *t)
        if (glob(tmp, GLOB_PERIOD, NULL, &gl) < 0)
                return;
 
-       rpc_uci_do_rollback(apply_ctx, NULL, &gl);
-}
-
-static int
-rpc_uci_apply_access(const char *sid, glob_t *gl)
-{
-       struct stat s;
-       int i, c = 0;
+       rpc_uci_do_rollback(apply_ctx, &gl);
 
-       if (gl->gl_pathc < 3)
-               return UBUS_STATUS_NO_DATA;
-
-       for (i = 0; i < gl->gl_pathc; i++) {
-               char *config = basename(gl->gl_pathv[i]);
-
-               if (*config == '.')
-                       continue;
-               if (stat(gl->gl_pathv[i], &s) || !s.st_size)
-                       continue;
-               if (!rpc_session_access(sid, "uci", config, "write"))
-                       return UBUS_STATUS_PERMISSION_DENIED;
-               c++;
-       }
-
-       if (!c)
-               return UBUS_STATUS_NO_DATA;
-
-       return 0;
+       globfree(&gl);
 }
 
 static int
@@ -1385,6 +1411,8 @@ rpc_uci_apply(struct ubus_context *ctx, struct ubus_object *obj,
        rpc_uci_purge_dir(RPC_SNAPSHOT_DELTA);
 
        if (!apply_sid[0]) {
+               rpc_uci_set_savedir(tb[RPC_T_SESSION]);
+
                mkdir(RPC_SNAPSHOT_FILES, 0700);
                mkdir(RPC_SNAPSHOT_DELTA, 0700);
 
@@ -1491,7 +1519,7 @@ rpc_uci_rollback(struct ubus_context *ctx, struct ubus_object *obj,
        if (glob(tmp, GLOB_PERIOD, NULL, &gl) < 0)
                return UBUS_STATUS_NOT_FOUND;
 
-       rpc_uci_do_rollback(ctx, sid, &gl);
+       rpc_uci_do_rollback(ctx, &gl);
 
        globfree(&gl);