uci: add state call to retrieve uci state variables

[project/rpcd.git] / session.c

diff --git a/session.c b/session.c
index dad7bf1..30adf0b 100644 (file)
--- a/session.c
+++ b/session.c
@@ -44,7 +44,7 @@ static const struct blobmsg_policy new_policy = {
 };
 
 static const struct blobmsg_policy sid_policy = {
-       .name = "sid", .type = BLOBMSG_TYPE_STRING
+       .name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING
 };
 
 enum {
@@ -53,7 +53,7 @@ enum {
        __RPC_SS_MAX,
 };
 static const struct blobmsg_policy set_policy[__RPC_SS_MAX] = {
-       [RPC_SS_SID] = { .name = "sid", .type = BLOBMSG_TYPE_STRING },
+       [RPC_SS_SID] = { .name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING },
        [RPC_SS_VALUES] = { .name = "values", .type = BLOBMSG_TYPE_TABLE },
 };
 
@@ -63,7 +63,7 @@ enum {
        __RPC_SG_MAX,
 };
 static const struct blobmsg_policy get_policy[__RPC_SG_MAX] = {
-       [RPC_SG_SID] = { .name = "sid", .type = BLOBMSG_TYPE_STRING },
+       [RPC_SG_SID] = { .name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING },
        [RPC_SG_KEYS] = { .name = "keys", .type = BLOBMSG_TYPE_ARRAY },
 };
 
@@ -74,7 +74,7 @@ enum {
        __RPC_SA_MAX,
 };
 static const struct blobmsg_policy acl_policy[__RPC_SA_MAX] = {
-       [RPC_SA_SID] = { .name = "sid", .type = BLOBMSG_TYPE_STRING },
+       [RPC_SA_SID] = { .name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING },
        [RPC_SA_SCOPE] = { .name = "scope", .type = BLOBMSG_TYPE_STRING },
        [RPC_SA_OBJECTS] = { .name = "objects", .type = BLOBMSG_TYPE_ARRAY },
 };
@@ -87,7 +87,7 @@ enum {
        __RPC_SP_MAX,
 };
 static const struct blobmsg_policy perm_policy[__RPC_SP_MAX] = {
-       [RPC_SP_SID] = { .name = "sid", .type = BLOBMSG_TYPE_STRING },
+       [RPC_SP_SID] = { .name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING },
        [RPC_SP_SCOPE] = { .name = "scope", .type = BLOBMSG_TYPE_STRING },
        [RPC_SP_OBJECT] = { .name = "object", .type = BLOBMSG_TYPE_STRING },
        [RPC_SP_FUNCTION] = { .name = "function", .type = BLOBMSG_TYPE_STRING },
@@ -101,7 +101,7 @@ enum {
        __RPC_DUMP_MAX,
 };
 static const struct blobmsg_policy dump_policy[__RPC_DUMP_MAX] = {
-       [RPC_DUMP_SID] = { .name = "sid", .type = BLOBMSG_TYPE_STRING },
+       [RPC_DUMP_SID] = { .name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING },
        [RPC_DUMP_TIMEOUT] = { .name = "timeout", .type = BLOBMSG_TYPE_INT32 },
        [RPC_DUMP_EXPIRES] = { .name = "expires", .type = BLOBMSG_TYPE_INT32 },
        [RPC_DUMP_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
@@ -209,7 +209,7 @@ rpc_session_to_blob(struct rpc_session *ses, bool acls)
 
        blob_buf_init(&buf, 0);
 
-       blobmsg_add_string(&buf, "sid", ses->id);
+       blobmsg_add_string(&buf, "ubus_rpc_session", ses->id);
        blobmsg_add_u32(&buf, "timeout", ses->timeout);
        blobmsg_add_u32(&buf, "expires", uloop_timeout_remaining(&ses->t) / 1000);
 
@@ -526,14 +526,14 @@ rpc_handle_acl(struct ubus_context *ctx, struct ubus_object *obj,
                return cb(ses, scope, NULL, NULL);
 
        blobmsg_for_each_attr(attr, tb[RPC_SA_OBJECTS], rem1) {
-               if (blob_id(attr) != BLOBMSG_TYPE_ARRAY)
+               if (blobmsg_type(attr) != BLOBMSG_TYPE_ARRAY)
                        continue;
 
                object = NULL;
                function = NULL;
 
                blobmsg_for_each_attr(sattr, attr, rem2) {
-                       if (blob_id(sattr) != BLOBMSG_TYPE_STRING)
+                       if (blobmsg_type(sattr) != BLOBMSG_TYPE_STRING)
                                continue;
 
                        if (!object)
@@ -676,7 +676,7 @@ rpc_handle_get(struct ubus_context *ctx, struct ubus_object *obj,
 
        if (tb[RPC_SG_KEYS])
                blobmsg_for_each_attr(attr, tb[RPC_SG_KEYS], rem) {
-                       if (blob_id(attr) != BLOBMSG_TYPE_STRING)
+                       if (blobmsg_type(attr) != BLOBMSG_TYPE_STRING)
                                continue;
 
                        data = avl_find_element(&ses->data, blobmsg_data(attr), data, avl);
@@ -724,7 +724,7 @@ rpc_handle_unset(struct ubus_context *ctx, struct ubus_object *obj,
        }
 
        blobmsg_for_each_attr(attr, tb[RPC_SG_KEYS], rem) {
-               if (blob_id(attr) != BLOBMSG_TYPE_STRING)
+               if (blobmsg_type(attr) != BLOBMSG_TYPE_STRING)
                        continue;
 
                data = avl_find_element(&ses->data, blobmsg_data(attr), data, avl);
@@ -863,6 +863,7 @@ static bool
 rpc_login_test_permission(struct uci_section *s,
                           const char *perm, const char *group)
 {
+       const char *p;
        struct uci_option *o;
        struct uci_element *e, *l;
 
@@ -883,9 +884,30 @@ rpc_login_test_permission(struct uci_section *s,
                if (strcmp(o->e.name, perm))
                        continue;
 
-               uci_foreach_element(&o->v.list, l)
-                       if (l->name && !fnmatch(l->name, group, 0))
+               /* Match negative expressions first. If a negative expression matches
+                * the current group name then deny access. */
+               uci_foreach_element(&o->v.list, l) {
+                       p = l->name;
+
+                       if (!p || *p != '!')
+                               continue;
+
+                       while (isspace(*++p));
+
+                       if (!*p)
+                               continue;
+
+                       if (!fnmatch(p, group, 0))
+                               return false;
+               }
+
+               uci_foreach_element(&o->v.list, l) {
+                       if (!l->name || !*l->name || *l->name == '!')
+                               continue;
+
+                       if (!fnmatch(l->name, group, 0))
                                return true;
+               }
        }
 
        /* make sure that write permission implies read permission */
@@ -914,13 +936,13 @@ rpc_login_setup_acl_scope(struct rpc_session *ses,
         *              ]
         *      }
         */
-       if (blob_id(acl_scope) == BLOBMSG_TYPE_TABLE) {
+       if (blobmsg_type(acl_scope) == BLOBMSG_TYPE_TABLE) {
                blobmsg_for_each_attr(acl_obj, acl_scope, rem) {
-                       if (blob_id(acl_obj) != BLOBMSG_TYPE_ARRAY)
+                       if (blobmsg_type(acl_obj) != BLOBMSG_TYPE_ARRAY)
                                continue;
 
                        blobmsg_for_each_attr(acl_func, acl_obj, rem2) {
-                               if (blob_id(acl_func) != BLOBMSG_TYPE_STRING)
+                               if (blobmsg_type(acl_func) != BLOBMSG_TYPE_STRING)
                                        continue;
 
                                rpc_session_grant(ses, blobmsg_name(acl_scope),
@@ -940,9 +962,9 @@ rpc_login_setup_acl_scope(struct rpc_session *ses,
         *              ...
         *      ]
         */
-       else if (blob_id(acl_scope) == BLOBMSG_TYPE_ARRAY) {
+       else if (blobmsg_type(acl_scope) == BLOBMSG_TYPE_ARRAY) {
                blobmsg_for_each_attr(acl_obj, acl_scope, rem) {
-                       if (blob_id(acl_obj) != BLOBMSG_TYPE_STRING)
+                       if (blobmsg_type(acl_obj) != BLOBMSG_TYPE_STRING)
                                continue;
 
                        rpc_session_grant(ses, blobmsg_name(acl_scope),
@@ -971,7 +993,7 @@ rpc_login_setup_acl_file(struct rpc_session *ses, struct uci_section *login,
        blob_for_each_attr(acl_group, acl.head, rem) {
                /* Iterate permission objects in each access group object */
                blobmsg_for_each_attr(acl_perm, acl_group, rem2) {
-                       if (blob_id(acl_perm) != BLOBMSG_TYPE_TABLE)
+                       if (blobmsg_type(acl_perm) != BLOBMSG_TYPE_TABLE)
                                continue;
 
                        /* Only "read" and "write" permissions are defined */
@@ -1166,6 +1188,8 @@ rpc_blob_from_file(const char *path)
        if (len != blob_pad_len(&head))
                goto fail;
 
+       close(fd);
+
        return attr;
 
 fail: