session: restore ACL dumping for session get and session list calls

[project/rpcd.git] / session.c

diff --git a/session.c b/session.c
index a4ed5f3..dad7bf1 100644 (file)
--- a/session.c
+++ b/session.c
@@ -203,7 +203,7 @@ rpc_session_dump_acls(struct rpc_session *ses, struct blob_buf *b)
 }
 
 static void
-rpc_session_to_blob(struct rpc_session *ses)
+rpc_session_to_blob(struct rpc_session *ses, bool acls)
 {
        void *c;
 
@@ -213,6 +213,12 @@ rpc_session_to_blob(struct rpc_session *ses)
        blobmsg_add_u32(&buf, "timeout", ses->timeout);
        blobmsg_add_u32(&buf, "expires", uloop_timeout_remaining(&ses->t) / 1000);
 
+       if (acls) {
+               c = blobmsg_open_table(&buf, "acls");
+               rpc_session_dump_acls(ses, &buf);
+               blobmsg_close_table(&buf, c);
+       }
+
        c = blobmsg_open_table(&buf, "data");
        rpc_session_dump_data(ses, &buf);
        blobmsg_close_table(&buf, c);
@@ -222,7 +228,7 @@ static void
 rpc_session_dump(struct rpc_session *ses, struct ubus_context *ctx,
                  struct ubus_request_data *req)
 {
-       rpc_session_to_blob(ses);
+       rpc_session_to_blob(ses, true);
 
        ubus_send_reply(ctx, req, buf.head);
 }
@@ -380,7 +386,7 @@ uh_id_len(const char *str)
 }
 
 static int
-rpc_session_grant(struct rpc_session *ses, struct ubus_context *ctx,
+rpc_session_grant(struct rpc_session *ses,
                   const char *scope, const char *object, const char *function)
 {
        struct rpc_session_acl *acl;
@@ -431,7 +437,7 @@ rpc_session_grant(struct rpc_session *ses, struct ubus_context *ctx,
 }
 
 static int
-rpc_session_revoke(struct rpc_session *ses, struct ubus_context *ctx,
+rpc_session_revoke(struct rpc_session *ses,
                    const char *scope, const char *object, const char *function)
 {
        struct rpc_session_acl *acl, *next;
@@ -496,8 +502,8 @@ rpc_handle_acl(struct ubus_context *ctx, struct ubus_object *obj,
        const char *scope = "ubus";
        int rem1, rem2;
 
-       int (*cb)(struct rpc_session *ses, struct ubus_context *ctx,
-                 const char *scope, const char *object, const char *function);
+       int (*cb)(struct rpc_session *ses,
+                 const char *scope, const char *object, const char *function);
 
        blobmsg_parse(acl_policy, __RPC_SA_MAX, tb, blob_data(msg), blob_len(msg));
 
@@ -517,7 +523,7 @@ rpc_handle_acl(struct ubus_context *ctx, struct ubus_object *obj,
                cb = rpc_session_revoke;
 
        if (!tb[RPC_SA_OBJECTS])
-               return cb(ses, ctx, scope, NULL, NULL);
+               return cb(ses, scope, NULL, NULL);
 
        blobmsg_for_each_attr(attr, tb[RPC_SA_OBJECTS], rem1) {
                if (blob_id(attr) != BLOBMSG_TYPE_ARRAY)
@@ -539,7 +545,7 @@ rpc_handle_acl(struct ubus_context *ctx, struct ubus_object *obj,
                }
 
                if (object && function)
-                       cb(ses, ctx, scope, object, function);
+                       cb(ses, scope, object, function);
        }
 
        return 0;
@@ -621,7 +627,7 @@ rpc_handle_set(struct ubus_context *ctx, struct ubus_object *obj,
                struct blob_attr *msg)
 {
        struct rpc_session *ses;
-       struct blob_attr *tb[__RPC_SA_MAX];
+       struct blob_attr *tb[__RPC_SS_MAX];
        struct blob_attr *attr;
        int rem;
 
@@ -651,7 +657,7 @@ rpc_handle_get(struct ubus_context *ctx, struct ubus_object *obj,
 {
        struct rpc_session *ses;
        struct rpc_session_data *data;
-       struct blob_attr *tb[__RPC_SA_MAX];
+       struct blob_attr *tb[__RPC_SG_MAX];
        struct blob_attr *attr;
        void *c;
        int rem;
@@ -917,9 +923,9 @@ rpc_login_setup_acl_scope(struct rpc_session *ses,
                                if (blob_id(acl_func) != BLOBMSG_TYPE_STRING)
                                        continue;
 
-                               rpc_session_grant(ses, NULL, blobmsg_name(acl_scope),
-                                                            blobmsg_name(acl_obj),
-                                                            blobmsg_data(acl_func));
+                               rpc_session_grant(ses, blobmsg_name(acl_scope),
+                                                      blobmsg_name(acl_obj),
+                                                      blobmsg_data(acl_func));
                        }
                }
        }
@@ -939,9 +945,9 @@ rpc_login_setup_acl_scope(struct rpc_session *ses,
                        if (blob_id(acl_obj) != BLOBMSG_TYPE_STRING)
                                continue;
 
-                       rpc_session_grant(ses, NULL, blobmsg_name(acl_scope),
-                                                        blobmsg_data(acl_obj),
-                                                        blobmsg_name(acl_perm));
+                       rpc_session_grant(ses, blobmsg_name(acl_scope),
+                                              blobmsg_data(acl_obj),
+                                              blobmsg_name(acl_perm));
                }
        }
 }
@@ -1006,9 +1012,9 @@ rpc_login_setup_acl_file(struct rpc_session *ses, struct uci_section *login,
                                 * access groups without having to test access of each single
                                 * <scope>/<object>/<function> tuple defined in a group.
                                 */
-                               rpc_session_grant(ses, NULL, "access-group",
-                                                            blobmsg_name(acl_group),
-                                                            blobmsg_name(acl_perm));
+                               rpc_session_grant(ses, "access-group",
+                                                      blobmsg_name(acl_group),
+                                                      blobmsg_name(acl_perm));
                        }
                }
        }
@@ -1296,7 +1302,7 @@ void rpc_session_freeze(void)
                        continue;
 
                snprintf(path, sizeof(path) - 1, RPC_SESSION_DIRECTORY "/%s", ses->id);
-               rpc_session_to_blob(ses);
+               rpc_session_to_blob(ses, false);
                rpc_blob_to_file(path, buf.head);
        }
 }