X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus-obj.c;h=990d04bd9844b8d590c555193742575e58e1458f;hp=a1062e0a5a8b247cb849b729867dd585c3d22761;hb=e59b44573423ad608d0752b46a6073222db9ed45;hpb=47a9ab0c645d4d49def8080ae68c7c477e733530

diff --git a/libubus-obj.c b/libubus-obj.c
index a1062e0..990d04b 100644
--- a/libubus-obj.c
+++ b/libubus-obj.c
@@ -69,7 +69,11 @@ ubus_process_invoke(struct ubus_context *ctx, struct ubus_msghdr *hdr,
 	req.peer = hdr->peer;
 	req.seq = hdr->seq;
 	req.object = obj->id;
-
+	if (attrbuf[UBUS_ATTR_USER] && attrbuf[UBUS_ATTR_GROUP]) {
+		req.acl.user = blobmsg_get_string(attrbuf[UBUS_ATTR_USER]);
+		req.acl.group = blobmsg_get_string(attrbuf[UBUS_ATTR_GROUP]);
+		req.acl.object = obj->name;
+	}
 	for (method = 0; method < obj->n_methods; method++)
 		if (!obj->methods[method].name ||
 		    !strcmp(obj->methods[method].name,
@@ -91,15 +95,17 @@ send:
 	ubus_complete_deferred_request(ctx, &req, ret);
 }
 
-void __hidden ubus_process_obj_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr)
+void __hidden ubus_process_obj_msg(struct ubus_context *ctx, struct ubus_msghdr_buf *buf)
 {
 	void (*cb)(struct ubus_context *, struct ubus_msghdr *,
 		   struct ubus_object *, struct blob_attr **);
+	struct ubus_msghdr *hdr = &buf->hdr;
 	struct blob_attr **attrbuf;
 	struct ubus_object *obj;
 	uint32_t objid;
+	void *prev_data = NULL;
 
-	attrbuf = ubus_parse_msg(ubus_msghdr_data(hdr));
+	attrbuf = ubus_parse_msg(buf->data);
 	if (!attrbuf[UBUS_ATTR_OBJID])
 		return;
 
@@ -119,7 +125,20 @@ void __hidden ubus_process_obj_msg(struct ubus_context *ctx, struct ubus_msghdr
 	default:
 		return;
 	}
+
+	if (buf == &ctx->msgbuf) {
+		prev_data = buf->data;
+		buf->data = NULL;
+	}
+
 	cb(ctx, hdr, obj, attrbuf);
+
+	if (prev_data) {
+		if (buf->data)
+			free(prev_data);
+		else
+			buf->data = prev_data;
+	}
 }
 
 static void ubus_add_object_cb(struct ubus_request *req, int type, struct blob_attr *msg)
@@ -146,8 +165,12 @@ static void ubus_push_method_data(const struct ubus_method *m)
 
 	mtbl = blobmsg_open_table(&b, m->name);
 
-	for (i = 0; i < m->n_policy; i++)
+	for (i = 0; i < m->n_policy; i++) {
+		if (m->mask && !(m->mask & (1 << i)))
+			continue;
+
 		blobmsg_add_u32(&b, m->policy[i].name, m->policy[i].type);
+	}
 
 	blobmsg_close_table(&b, mtbl);
 }