ubusd: fix id lookup of objects with path and no methods

[project/ubus.git] / ubusd_proto.c

diff --git a/ubusd_proto.c b/ubusd_proto.c
index 8954682..d2feed9 100644 (file)
--- a/ubusd_proto.c
+++ b/ubusd_proto.c
@@ -32,9 +32,11 @@ static const struct blob_attr_info ubus_policy[UBUS_ATTR_MAX] = {
        [UBUS_ATTR_OBJID] = { .type = BLOB_ATTR_INT32 },
        [UBUS_ATTR_STATUS] = { .type = BLOB_ATTR_INT32 },
        [UBUS_ATTR_METHOD] = { .type = BLOB_ATTR_STRING },
+       [UBUS_ATTR_USER] = { .type = BLOB_ATTR_STRING },
+       [UBUS_ATTR_GROUP] = { .type = BLOB_ATTR_STRING },
 };
 
-static struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
+struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
 {
        blob_parse(msg, attrbuf, ubus_policy, UBUS_ATTR_MAX);
        return attrbuf;
@@ -74,8 +76,8 @@ static struct ubus_msg_buf *ubus_reply_from_blob(struct ubus_msg_buf *ub, bool s
        return new;
 }
 
-static void
-ubus_send_msg_from_blob(struct ubus_client *cl, struct ubus_msg_buf *ub,
+void
+ubus_proto_send_msg_from_blob(struct ubus_client *cl, struct ubus_msg_buf *ub,
                        uint8_t type)
 {
        ub = ubus_reply_from_blob(ub, true);
@@ -128,8 +130,8 @@ static int ubusd_handle_remove_object(struct ubus_client *cl, struct ubus_msg_bu
        if (obj->type && obj->type->refcount == 1)
                blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
 
+       ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
        ubusd_free_object(obj);
-       ubus_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
 
        return 0;
 }
@@ -144,18 +146,22 @@ static int ubusd_handle_add_object(struct ubus_client *cl, struct ubus_msg_buf *
 
        blob_buf_init(&b, 0);
        blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
-       if (attr[UBUS_ATTR_SIGNATURE])
+       if (attr[UBUS_ATTR_SIGNATURE] && obj->type)
                blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
 
-       ubus_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
+       ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
        return 0;
 }
 
 static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, struct ubus_object *obj)
 {
        struct ubus_method *m;
+       int all_cnt = 0, cnt = 0;
        void *s;
 
+       if (!obj->type)
+               return;
+
        blob_buf_init(&b, 0);
 
        blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->path.key);
@@ -163,11 +169,17 @@ static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
        blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
 
        s = blob_nest_start(&b, UBUS_ATTR_SIGNATURE);
-       list_for_each_entry(m, &obj->type->methods, list)
-               blobmsg_add_blob(&b, m->data);
+       list_for_each_entry(m, &obj->type->methods, list) {
+               all_cnt++;
+               if (!ubusd_acl_check(cl, obj->path.key, blobmsg_name(m->data), UBUS_ACL_ACCESS)) {
+                       blobmsg_add_blob(&b, m->data);
+                       cnt++;
+               }
+       }
        blob_nest_end(&b, s);
 
-       ubus_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
+       if (cnt || !all_cnt)
+               ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
 }
 
 static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
@@ -215,15 +227,20 @@ static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub,
 }
 
 static void
-ubusd_forward_invoke(struct ubus_object *obj, const char *method,
-                    struct ubus_msg_buf *ub, struct blob_attr *data)
+ubusd_forward_invoke(struct ubus_client *cl, struct ubus_object *obj,
+                    const char *method, struct ubus_msg_buf *ub,
+                    struct blob_attr *data)
 {
        blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
        blob_put_string(&b, UBUS_ATTR_METHOD, method);
+       if (cl->user)
+               blob_put_string(&b, UBUS_ATTR_USER, cl->user);
+       if (cl->group)
+               blob_put_string(&b, UBUS_ATTR_GROUP, cl->group);
        if (data)
                blob_put(&b, UBUS_ATTR_DATA, blob_data(data), blob_len(data));
 
-       ubus_send_msg_from_blob(obj->client, ub, UBUS_MSG_INVOKE);
+       ubus_proto_send_msg_from_blob(obj->client, ub, UBUS_MSG_INVOKE);
 }
 
 static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
@@ -243,12 +260,16 @@ static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub,
 
        method = blob_data(attr[UBUS_ATTR_METHOD]);
 
+       if (ubusd_acl_check(cl, obj->path.key, method, UBUS_ACL_ACCESS))
+               return UBUS_STATUS_PERMISSION_DENIED;
+
        if (!obj->client)
-               return obj->recv_msg(cl, method, attr[UBUS_ATTR_DATA]);
+               return obj->recv_msg(cl, ub, method, attr[UBUS_ATTR_DATA]);
 
        ub->hdr.peer = cl->id.id;
        blob_buf_init(&b, 0);
-       ubusd_forward_invoke(obj, method, ub, attr[UBUS_ATTR_DATA]);
+
+       ubusd_forward_invoke(cl, obj, method, ub, attr[UBUS_ATTR_DATA]);
        ubus_msg_free(ub);
 
        return -1;
@@ -286,7 +307,7 @@ static int ubusd_handle_notify(struct ubus_client *cl, struct ubus_msg_buf *ub,
                }
                blob_nest_end(&b, c);
                blob_put_int32(&b, UBUS_ATTR_STATUS, 0);
-               ubus_send_msg_from_blob(cl, ub, UBUS_MSG_STATUS);
+               ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_STATUS);
        }
 
        ub->hdr.peer = cl->id.id;
@@ -295,7 +316,7 @@ static int ubusd_handle_notify(struct ubus_client *cl, struct ubus_msg_buf *ub,
                blob_buf_init(&b, 0);
                if (no_reply)
                        blob_put_int8(&b, UBUS_ATTR_NO_REPLY, 1);
-               ubusd_forward_invoke(s->subscriber, method, ub, attr[UBUS_ATTR_DATA]);
+               ubusd_forward_invoke(cl, s->subscriber, method, ub, attr[UBUS_ATTR_DATA]);
        }
        ubus_msg_free(ub);
 
@@ -357,12 +378,19 @@ static int ubusd_handle_add_watch(struct ubus_client *cl, struct ubus_msg_buf *u
                return UBUS_STATUS_INVALID_ARGUMENT;
 
        target = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_TARGET]));
-       if (!target)
+       if (!target || !target->client)
                return UBUS_STATUS_NOT_FOUND;
 
        if (cl == target->client)
                return UBUS_STATUS_INVALID_ARGUMENT;
 
+       if (!target->path.key) {
+               if (strcmp(target->client->user, cl->user) && strcmp(target->client->group, cl->group))
+                       return UBUS_STATUS_NOT_FOUND;
+       } else if (ubusd_acl_check(cl, target->path.key, NULL, UBUS_ACL_SUBSCRIBE)) {
+               return UBUS_STATUS_NOT_FOUND;
+       }
+
        ubus_subscribe(obj, target);
        return 0;
 }
@@ -444,6 +472,9 @@ struct ubus_client *ubusd_proto_new_client(int fd, uloop_fd_handler cb)
        if (!cl)
                return NULL;
 
+       if (ubusd_acl_init_client(cl, fd))
+               goto free;
+
        INIT_LIST_HEAD(&cl->objects);
        cl->sock.fd = fd;
        cl->sock.cb = cb;
@@ -473,6 +504,7 @@ void ubusd_proto_free_client(struct ubus_client *cl)
                ubusd_free_object(obj);
        }
 
+       ubusd_acl_free_client(cl);
        ubus_free_id(&clients, &cl->id);
 }