sys: use "Auto-Installed" field for packagelist

[project/rpcd.git] / uci.c

diff --git a/uci.c b/uci.c
index 5f26dbd625f309e3773784ce85f9db715e3cb963..3cd2b829efd055e3096da1499fbf2e70f5f1850b 100644 (file)
--- a/uci.c
+++ b/uci.c
@@ -734,6 +734,7 @@ rpc_uci_add(struct ubus_context *ctx, struct ubus_object *obj,
        {
                blobmsg_for_each_attr(cur, tb[RPC_A_VALUES], rem)
                {
+                       ptr.flags = 0;
                        ptr.o = NULL;
                        ptr.option = blobmsg_name(cur);
 
@@ -811,43 +812,63 @@ out:
  *  3) in all other cases only emit a set operation if there is no existing
  *     option of if the existing options value differs from the blob value
  */
-static void
+static int
 rpc_uci_merge_set(struct blob_attr *opt, struct uci_ptr *ptr)
 {
        struct blob_attr *cur;
-       int rem;
+       int rem, rv;
 
+       ptr->flags = 0;
        ptr->o = NULL;
        ptr->option = blobmsg_name(opt);
        ptr->value = NULL;
 
        if (!rpc_uci_verify_name(ptr->option))
-               return;
+               return UBUS_STATUS_INVALID_ARGUMENT;
 
        if (rpc_uci_lookup(ptr) || !ptr->s)
-               return;
+               return UBUS_STATUS_NOT_FOUND;
 
        if (blobmsg_type(opt) == BLOBMSG_TYPE_ARRAY)
        {
-               if (ptr->o)
+               if (ptr->o) {
                        uci_delete(cursor, ptr);
+                       ptr->flags = 0;
+               }
+
+               rv = UBUS_STATUS_INVALID_ARGUMENT;
 
                blobmsg_for_each_attr(cur, opt, rem)
-                       if (rpc_uci_format_blob(cur, &ptr->value))
-                               uci_add_list(cursor, ptr);
+               {
+                       if (!rpc_uci_format_blob(cur, &ptr->value))
+                               continue;
+
+                       uci_add_list(cursor, ptr);
+                       rv = 0;
+               }
+
+               return rv;
        }
        else if (ptr->o && ptr->o->type == UCI_TYPE_LIST)
        {
                uci_delete(cursor, ptr);
+               ptr->flags = 0;
 
-               if (rpc_uci_format_blob(opt, &ptr->value))
-                       uci_set(cursor, ptr);
+               if (!rpc_uci_format_blob(opt, &ptr->value))
+                       return UBUS_STATUS_INVALID_ARGUMENT;
+
+               uci_set(cursor, ptr);
        }
-       else if (rpc_uci_format_blob(opt, &ptr->value))
+       else
        {
+               if (!rpc_uci_format_blob(opt, &ptr->value))
+                       return UBUS_STATUS_INVALID_ARGUMENT;
+
                if (!ptr->o || !ptr->o->v.string || strcmp(ptr->o->v.string, ptr->value))
                        uci_set(cursor, ptr);
        }
+
+       return 0;
 }
 
 static int
@@ -860,7 +881,7 @@ rpc_uci_set(struct ubus_context *ctx, struct ubus_object *obj,
        struct uci_package *p = NULL;
        struct uci_element *e;
        struct uci_ptr ptr = { 0 };
-       int rem;
+       int rem, rv, err = 0;
 
        blobmsg_parse(rpc_uci_set_policy, __RPC_S_MAX, tb,
                      blob_data(msg), blob_len(msg));
@@ -885,7 +906,12 @@ rpc_uci_set(struct ubus_context *ctx, struct ubus_object *obj,
        {
                ptr.section = blobmsg_data(tb[RPC_S_SECTION]);
                blobmsg_for_each_attr(cur, tb[RPC_S_VALUES], rem)
-                       rpc_uci_merge_set(cur, &ptr);
+               {
+                       rv = rpc_uci_merge_set(cur, &ptr);
+
+                       if (rv)
+                               err = rv;
+               }
        }
        else
        {
@@ -899,14 +925,24 @@ rpc_uci_set(struct ubus_context *ctx, struct ubus_object *obj,
                        ptr.section = e->name;
 
                        blobmsg_for_each_attr(cur, tb[RPC_S_VALUES], rem)
-                               rpc_uci_merge_set(cur, &ptr);
+                       {
+                               rv = rpc_uci_merge_set(cur, &ptr);
+
+                               if (rv)
+                                       err = rv;
+                       }
                }
        }
 
-       uci_save(cursor, p);
+       if (!err && !ptr.s)
+               err = UBUS_STATUS_NOT_FOUND;
+
+       if (!err)
+               uci_save(cursor, p);
+
        uci_unload(cursor, p);
 
-       return rpc_uci_status();
+       return err ? err : rpc_uci_status();
 }
 
 /*
@@ -915,14 +951,14 @@ rpc_uci_set(struct ubus_context *ctx, struct ubus_object *obj,
  *  2) if the blob is of type string, delete the option named after its value
  *  3) if the blob is NULL, delete entire section
  */
-static void
+static int
 rpc_uci_merge_delete(struct blob_attr *opt, struct uci_ptr *ptr)
 {
        struct blob_attr *cur;
-       int rem;
+       int rem, rv;
 
        if (rpc_uci_lookup(ptr) || !ptr->s)
-               return;
+               return UBUS_STATUS_NOT_FOUND;
 
        if (!opt)
        {
@@ -930,9 +966,12 @@ rpc_uci_merge_delete(struct blob_attr *opt, struct uci_ptr *ptr)
                ptr->option = NULL;
 
                uci_delete(cursor, ptr);
+               return 0;
        }
        else if (blobmsg_type(opt) == BLOBMSG_TYPE_ARRAY)
        {
+               rv = UBUS_STATUS_NOT_FOUND;
+
                blobmsg_for_each_attr(cur, opt, rem)
                {
                        if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
@@ -945,7 +984,11 @@ rpc_uci_merge_delete(struct blob_attr *opt, struct uci_ptr *ptr)
                                continue;
 
                        uci_delete(cursor, ptr);
+                       ptr->flags = 0;
+                       rv = 0;
                }
+
+               return rv;
        }
        else if (blobmsg_type(opt) == BLOBMSG_TYPE_STRING)
        {
@@ -953,10 +996,13 @@ rpc_uci_merge_delete(struct blob_attr *opt, struct uci_ptr *ptr)
                ptr->option = blobmsg_data(opt);
 
                if (rpc_uci_lookup(ptr) || !ptr->o)
-                       return;
+                       return UBUS_STATUS_NOT_FOUND;
 
                uci_delete(cursor, ptr);
+               return 0;
        }
+
+       return UBUS_STATUS_INVALID_ARGUMENT;
 }
 
 static int
@@ -968,6 +1014,7 @@ rpc_uci_delete(struct ubus_context *ctx, struct ubus_object *obj,
        struct uci_package *p = NULL;
        struct uci_element *e, *tmp;
        struct uci_ptr ptr = { 0 };
+       int err = 0;
 
        blobmsg_parse(rpc_uci_delete_policy, __RPC_D_MAX, tb,
                      blob_data(msg), blob_len(msg));
@@ -979,6 +1026,14 @@ rpc_uci_delete(struct ubus_context *ctx, struct ubus_object *obj,
        if (!rpc_uci_write_access(tb[RPC_D_SESSION], tb[RPC_D_CONFIG]))
                return UBUS_STATUS_PERMISSION_DENIED;
 
+       if (tb[RPC_D_TYPE] &&
+           !rpc_uci_verify_type(blobmsg_data(tb[RPC_D_TYPE])))
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       if (tb[RPC_D_SECTION] &&
+           !rpc_uci_verify_section(blobmsg_data(tb[RPC_D_SECTION])))
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
        ptr.package = blobmsg_data(tb[RPC_D_CONFIG]);
 
        if (uci_load(cursor, ptr.package, &p))
@@ -989,9 +1044,9 @@ rpc_uci_delete(struct ubus_context *ctx, struct ubus_object *obj,
                ptr.section = blobmsg_data(tb[RPC_D_SECTION]);
 
                if (tb[RPC_D_OPTIONS])
-                       rpc_uci_merge_delete(tb[RPC_D_OPTIONS], &ptr);
+                       err = rpc_uci_merge_delete(tb[RPC_D_OPTIONS], &ptr);
                else
-                       rpc_uci_merge_delete(tb[RPC_D_OPTION], &ptr);
+                       err = rpc_uci_merge_delete(tb[RPC_D_OPTION], &ptr);
        }
        else
        {
@@ -1005,16 +1060,21 @@ rpc_uci_delete(struct ubus_context *ctx, struct ubus_object *obj,
                        ptr.section = e->name;
 
                        if (tb[RPC_D_OPTIONS])
-                               rpc_uci_merge_delete(tb[RPC_D_OPTIONS], &ptr);
+                               err = rpc_uci_merge_delete(tb[RPC_D_OPTIONS], &ptr);
                        else
-                               rpc_uci_merge_delete(tb[RPC_D_OPTION], &ptr);
+                               err = rpc_uci_merge_delete(tb[RPC_D_OPTION], &ptr);
                }
+
+               if (!err && !ptr.section)
+                       err = UBUS_STATUS_NOT_FOUND;
        }
 
-       uci_save(cursor, p);
+       if (!err)
+               uci_save(cursor, p);
+
        uci_unload(cursor, p);
 
-       return rpc_uci_status();
+       return err ? err : rpc_uci_status();
 }
 
 static int
@@ -1077,7 +1137,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 = 0;
+       int rem, i = 0, err = 0;
 
        blobmsg_parse(rpc_uci_order_policy, __RPC_O_MAX, tb,
                      blob_data(msg), blob_len(msg));
@@ -1096,21 +1156,33 @@ rpc_uci_order(struct ubus_context *ctx, struct ubus_object *obj,
        blobmsg_for_each_attr(cur, tb[RPC_O_SECTIONS], rem)
        {
                if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+               {
+                       if (!err)
+                               err = UBUS_STATUS_INVALID_ARGUMENT;
+
                        continue;
+               }
 
                ptr.s = NULL;
                ptr.section = blobmsg_data(cur);
 
                if (uci_lookup_ptr(cursor, &ptr, NULL, true) || !ptr.s)
+               {
+                       if (!err)
+                               err = UBUS_STATUS_NOT_FOUND;
+
                        continue;
+               }
 
                uci_reorder_section(cursor, ptr.s, i++);
        }
 
-       uci_save(cursor, p);
+       if (!err)
+               uci_save(cursor, p);
+
        uci_unload(cursor, p);
 
-       return rpc_uci_status();
+       return err ? err : rpc_uci_status();
 }
 
 static void
@@ -1219,6 +1291,8 @@ rpc_uci_changes(struct ubus_context *ctx, struct ubus_object *obj,
                uci_unload(cursor, p);
        }
 
+       free(configs);
+
        blobmsg_close_table(&buf, c);
 
        ubus_send_reply(ctx, req, buf.head);
@@ -1323,6 +1397,8 @@ rpc_uci_configs(struct ubus_context *ctx, struct ubus_object *obj,
        for (i = 0; configs[i]; i++)
                blobmsg_add_string(&buf, NULL, configs[i]);
 
+       free(configs);
+
        blobmsg_close_array(&buf, c);
 
        ubus_send_reply(ctx, req, buf.head);
@@ -1702,7 +1778,7 @@ int rpc_uci_api_init(struct ubus_context *ctx)
        };
 
        static struct ubus_object_type uci_type =
-               UBUS_OBJECT_TYPE("luci-rpc-uci", uci_methods);
+               UBUS_OBJECT_TYPE("rpcd-plugin-uci", uci_methods);
 
        static struct ubus_object obj = {
                .name = "uci",