X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=ubusd_proto.c;h=48de9b96141c8011061ac9ae7d9885d5a0eb6b12;hb=HEAD;hp=991a70a8cb21d14ed89439664810e911629d117d;hpb=7798d56301b7264cbcea0a6a9225a210154c693a;p=project%2Fubus.git

diff --git a/ubusd_proto.c b/ubusd_proto.c
index 991a70a..48de9b9 100644
--- a/ubusd_proto.c
+++ b/ubusd_proto.c
@@ -17,8 +17,6 @@
 #include "ubusd.h"
 
 struct blob_buf b;
-static struct ubus_msg_buf *retmsg;
-static int *retmsg_data;
 static struct avl_tree clients;
 
 static struct blob_attr *attrbuf[UBUS_ATTR_MAX];
@@ -32,11 +30,13 @@ 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, size_t len)
 {
-	blob_parse(msg, attrbuf, ubus_policy, UBUS_ATTR_MAX);
+	blob_parse_untrusted(msg, len, attrbuf, ubus_policy, UBUS_ATTR_MAX);
 	return attrbuf;
 }
 
@@ -74,16 +74,21 @@ 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)
 {
+	/* keep the fd to be passed if it is UBUS_MSG_INVOKE */
+	int fd = ub->fd;
 	ub = ubus_reply_from_blob(ub, true);
 	if (!ub)
 		return;
 
 	ub->hdr.type = type;
-	ubus_msg_send(cl, ub, true);
+	ub->fd = fd;
+
+	ubus_msg_send(cl, ub);
+	ubus_msg_free(ub);
 }
 
 static bool ubusd_send_hello(struct ubus_client *cl)
@@ -96,14 +101,15 @@ static bool ubusd_send_hello(struct ubus_client *cl)
 		return false;
 
 	ubus_msg_init(ub, UBUS_MSG_HELLO, 0, cl->id.id);
-	ubus_msg_send(cl, ub, true);
+	ubus_msg_send(cl, ub);
+	ubus_msg_free(ub);
 	return true;
 }
 
 static int ubusd_send_pong(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
 	ub->hdr.type = UBUS_MSG_DATA;
-	ubus_msg_send(cl, ub, false);
+	ubus_msg_send(cl, ub);
 	return 0;
 }
 
@@ -128,8 +134,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,43 +150,92 @@ 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);
 
-	if (obj->path.key)
-		blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->path.key);
+	blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->path.key);
 	blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
 	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)
+static int ubus_client_cmd_queue_add(struct ubus_client *cl,
+					struct ubus_msg_buf *msg,
+					struct ubus_object *obj)
 {
-	struct ubus_object *obj;
+	struct ubus_client_cmd *cmd = malloc(sizeof(*cmd));
+
+	if (cmd) {
+		cmd->msg = msg;
+		cmd->obj = obj;
+		list_add_tail(&cmd->list, &cl->cmd_queue);
+		return -2;
+	}
+	return UBUS_STATUS_UNKNOWN_ERROR;
+}
+
+static int __ubusd_handle_lookup(struct ubus_client *cl,
+				struct ubus_msg_buf *ub,
+				struct blob_attr **attr,
+				struct ubus_client_cmd *cmd)
+{
+	struct ubus_object *obj = NULL;
 	char *objpath;
 	bool found = false;
 	int len;
 
 	if (!attr[UBUS_ATTR_OBJPATH]) {
-		avl_for_each_element(&path, obj, path)
-			ubusd_send_obj(cl, ub, obj);
+		if (cmd)
+			obj = cmd->obj;
+
+		/* Start from beginning or continue from the last object */
+		if (obj == NULL)
+			obj = avl_first_element(&path, obj, path);
+
+		avl_for_element_range(obj, avl_last_element(&path, obj, path), obj, path) {
+			/* Keep sending objects until buffering starts */
+			if (list_empty(&cl->tx_queue)) {
+				ubusd_send_obj(cl, ub, obj);
+			} else {
+				/* Queue command and continue on the next call */
+				int ret;
+
+				if (cmd == NULL) {
+					ret = ubus_client_cmd_queue_add(cl, ub, obj);
+				} else {
+					cmd->obj = obj;
+					ret = -2;
+				}
+				return ret;
+			}
+		}
 		return 0;
 	}
 
@@ -215,16 +270,55 @@ static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub,
 	return 0;
 }
 
+static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
+{
+	int rc;
+
+	if (list_empty(&cl->tx_queue))
+		rc = __ubusd_handle_lookup(cl, ub, attr, NULL);
+	else
+		rc = ubus_client_cmd_queue_add(cl, ub, NULL);
+
+	return rc;
+}
+
+int ubusd_cmd_lookup(struct ubus_client *cl, struct ubus_client_cmd *cmd)
+{
+	struct ubus_msg_buf *ub = cmd->msg;
+	struct blob_attr **attr;
+	int ret;
+
+	attr = ubus_parse_msg(ub->data, blob_raw_len(ub->data));
+	ret = __ubusd_handle_lookup(cl, ub, attr, cmd);
+
+	if (ret != -2) {
+		struct ubus_msg_buf *retmsg = cl->retmsg;
+		int *retmsg_data = blob_data(blob_data(retmsg->data));
+
+		retmsg->hdr.seq = ub->hdr.seq;
+		retmsg->hdr.peer = ub->hdr.peer;
+
+		*retmsg_data = htonl(ret);
+		ubus_msg_send(cl, retmsg);
+	}
+	return ret;
+}
+
 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)
@@ -244,13 +338,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]);
-	ubus_msg_free(ub);
+
+	ubusd_forward_invoke(cl, obj, method, ub, attr[UBUS_ATTR_DATA]);
 
 	return -1;
 }
@@ -287,7 +384,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;
@@ -296,9 +393,8 @@ 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);
 
 	return -1;
 }
@@ -321,25 +417,22 @@ static int ubusd_handle_response(struct ubus_client *cl, struct ubus_msg_buf *ub
 	if (!attr[UBUS_ATTR_OBJID] ||
 	    (ub->hdr.type == UBUS_MSG_STATUS && !attr[UBUS_ATTR_STATUS]) ||
 	    (ub->hdr.type == UBUS_MSG_DATA && !attr[UBUS_ATTR_DATA]))
-		goto error;
+		goto out;
 
 	obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
 	if (!obj)
-		goto error;
+		goto out;
 
 	if (cl != obj->client)
-		goto error;
+		goto out;
 
 	cl = ubusd_get_client_by_id(ub->hdr.peer);
 	if (!cl)
-		goto error;
+		goto out;
 
 	ub->hdr.peer = blob_get_u32(attr[UBUS_ATTR_OBJID]);
-	ubus_msg_send(cl, ub, true);
-	return -1;
-
-error:
-	ubus_msg_free(ub);
+	ubus_msg_send(cl, ub);
+out:
 	return -1;
 }
 
@@ -358,12 +451,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;
 }
@@ -413,6 +513,8 @@ void ubusd_proto_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub
 {
 	ubus_cmd_cb cb = NULL;
 	int ret;
+	struct ubus_msg_buf *retmsg = cl->retmsg;
+	int *retmsg_data = blob_data(blob_data(retmsg->data));
 
 	retmsg->hdr.seq = ub->hdr.seq;
 	retmsg->hdr.peer = ub->hdr.peer;
@@ -420,21 +522,43 @@ void ubusd_proto_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub
 	if (ub->hdr.type < __UBUS_MSG_LAST)
 		cb = handlers[ub->hdr.type];
 
-	if (ub->hdr.type != UBUS_MSG_STATUS)
+	if (ub->hdr.type != UBUS_MSG_STATUS && ub->hdr.type != UBUS_MSG_INVOKE)
 		ubus_msg_close_fd(ub);
 
+	/* Note: no callback should free the `ub` buffer
+	         that's always done right after the callback finishes */
 	if (cb)
-		ret = cb(cl, ub, ubus_parse_msg(ub->data));
+		ret = cb(cl, ub, ubus_parse_msg(ub->data, blob_raw_len(ub->data)));
 	else
 		ret = UBUS_STATUS_INVALID_COMMAND;
 
-	if (ret == -1)
+	/* Command has not been completed yet and got queued */
+	if (ret == -2)
 		return;
 
 	ubus_msg_free(ub);
 
+	if (ret == -1)
+		return;
+
 	*retmsg_data = htonl(ret);
-	ubus_msg_send(cl, retmsg, false);
+	ubus_msg_send(cl, retmsg);
+}
+
+static int ubusd_proto_init_retmsg(struct ubus_client *cl)
+{
+	struct blob_buf *b = &cl->b;
+
+	blob_buf_init(&cl->b, 0);
+	blob_put_int32(&cl->b, UBUS_ATTR_STATUS, 0);
+
+	/* we make the 'retmsg' buffer shared with the blob_buf b, to reduce mem duplication */
+	cl->retmsg = ubus_msg_new(b->head, blob_raw_len(b->head), true);
+	if (!cl->retmsg)
+		return -1;
+
+	cl->retmsg->hdr.type = UBUS_MSG_STATUS;
+	return 0;
 }
 
 struct ubus_client *ubusd_proto_new_client(int fd, uloop_fd_handler cb)
@@ -445,7 +569,12 @@ 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);
+	INIT_LIST_HEAD(&cl->cmd_queue);
+	INIT_LIST_HEAD(&cl->tx_queue);
 	cl->sock.fd = fd;
 	cl->sock.cb = cb;
 	cl->pending_msg_fd = -1;
@@ -453,6 +582,9 @@ struct ubus_client *ubusd_proto_new_client(int fd, uloop_fd_handler cb)
 	if (!ubus_alloc_id(&clients, &cl->id, 0))
 		goto free;
 
+	if (ubusd_proto_init_retmsg(cl))
+		goto free;
+
 	if (!ubusd_send_hello(cl))
 		goto delete;
 
@@ -467,13 +599,16 @@ free:
 
 void ubusd_proto_free_client(struct ubus_client *cl)
 {
-	struct ubus_object *obj;
+	struct ubus_object *obj, *tmp;
 
-	while (!list_empty(&cl->objects)) {
-		obj = list_first_entry(&cl->objects, struct ubus_object, list);
+	list_for_each_entry_safe(obj, tmp, &cl->objects, list) {
 		ubusd_free_object(obj);
 	}
 
+	ubus_msg_free(cl->retmsg);
+	blob_buf_free(&cl->b);
+
+	ubusd_acl_free_client(cl);
 	ubus_free_id(&clients, &cl->id);
 }
 
@@ -491,7 +626,8 @@ void ubus_notify_subscription(struct ubus_object *obj)
 		return;
 
 	ubus_msg_init(ub, UBUS_MSG_NOTIFY, ++obj->invoke_seq, 0);
-	ubus_msg_send(obj->client, ub, true);
+	ubus_msg_send(obj->client, ub);
+	ubus_msg_free(ub);
 }
 
 void ubus_notify_unsubscribe(struct ubus_subscription *s)
@@ -505,7 +641,8 @@ void ubus_notify_unsubscribe(struct ubus_subscription *s)
 	ub = ubus_msg_from_blob(false);
 	if (ub != NULL) {
 		ubus_msg_init(ub, UBUS_MSG_UNSUBSCRIBE, ++s->subscriber->invoke_seq, 0);
-		ubus_msg_send(s->subscriber->client, ub, true);
+		ubus_msg_send(s->subscriber->client, ub);
+		ubus_msg_free(ub);
 	}
 
 	ubus_unsubscribe(s);
@@ -514,14 +651,4 @@ void ubus_notify_unsubscribe(struct ubus_subscription *s)
 static void __constructor ubusd_proto_init(void)
 {
 	ubus_init_id_tree(&clients);
-
-	blob_buf_init(&b, 0);
-	blob_put_int32(&b, UBUS_ATTR_STATUS, 0);
-
-	retmsg = ubus_msg_from_blob(false);
-	if (!retmsg)
-		exit(1);
-
-	retmsg->hdr.type = UBUS_MSG_STATUS;
-	retmsg_data = blob_data(blob_data(retmsg->data));
 }