X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=ubusd_acl.c;h=352c581c3d38b23c76ae520e66f1698e542b3e76;hb=HEAD;hp=6257f811a6514ac36e4b719b1f1966c49dfeb711;hpb=221ce7e7ff1bd1a0c9995fa9d32f58e865f7207f;p=project%2Fubus.git

diff --git a/ubusd_acl.c b/ubusd_acl.c
index 6257f81..352c581 100644
--- a/ubusd_acl.c
+++ b/ubusd_acl.c
@@ -26,6 +26,7 @@
 #include <libubox/vlist.h>
 #include <libubox/blobmsg_json.h>
 #include <libubox/avl-cmp.h>
+#include <libubox/ulog.h>
 
 #include "ubusd.h"
 
@@ -116,7 +117,7 @@ ubusd_acl_check(struct ubus_client *cl, const char *obj,
 			if (!acl->partial)
 				continue;
 
-			if (match_len != strlen(key))
+			if (match_len != (int) strlen(key))
 				continue;
 		}
 
@@ -147,12 +148,16 @@ ubusd_acl_check(struct ubus_client *cl, const char *obj,
 		case UBUS_ACL_ACCESS:
 			if (acl->methods) {
 				struct blob_attr *cur;
-				int rem;
+				char *cur_method;
+				size_t rem;
 
 				blobmsg_for_each_attr(cur, acl->methods, rem)
-					if (blobmsg_type(cur) == BLOBMSG_TYPE_STRING)
-						if (!strcmp(method, blobmsg_get_string(cur)))
+					if (blobmsg_type(cur) == BLOBMSG_TYPE_STRING) {
+						cur_method = blobmsg_get_string(cur);
+
+						if (!strcmp(method, cur_method) || !strcmp("*", cur_method))
 							return 0;
+					}
 			}
 			break;
 		}
@@ -171,19 +176,25 @@ ubusd_acl_init_client(struct ubus_client *cl, int fd)
 #ifdef SO_PEERCRED
 	unsigned int len = sizeof(struct ucred);
 
-	if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cred, &len) == -1)
+	if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cred, &len) == -1) {
+		ULOG_ERR("Failed getsockopt(): %m\n");
 		return -1;
+	}
 #else
 	memset(&cred, 0, sizeof(cred));
 #endif
 
 	pwd = getpwuid(cred.uid);
-	if (!pwd)
+	if (!pwd) {
+		ULOG_ERR("Failed getpwuid(): %m\n");
 		return -1;
+	}
 
 	group = getgrgid(cred.gid);
-	if (!group)
+	if (!group) {
+		ULOG_ERR("Failed getgrgid(): %m\n");
 		return -1;
+	}
 
 	cl->uid = cred.uid;
 	cl->gid = cred.gid;
@@ -332,7 +343,7 @@ static void
 ubusd_acl_file_add(struct ubusd_acl_file *file)
 {
 	struct blob_attr *tb[__ACL_MAX], *cur;
-	int rem;
+	size_t rem;
 
 	blobmsg_parse(acl_policy, __ACL_MAX, tb, blob_data(file->blob),
 		      blob_len(file->blob));
@@ -435,7 +446,7 @@ ubusd_acl_load(void)
 {
 	struct stat st;
 	glob_t gl;
-	int j;
+	size_t j;
 	const char *suffix = "/*.json";
 	char *path = alloca(strlen(ubusd_acl_dir) + strlen(suffix) + 1);
 
@@ -499,7 +510,7 @@ ubusd_reply_add(struct ubus_object *obj)
 			if (!acl->partial)
 				continue;
 
-			if (match_len != strlen(key))
+			if (match_len != (int) strlen(key))
 				continue;
 		}
 
@@ -549,7 +560,7 @@ static int ubusd_reply_query(struct ubus_client *cl, struct ubus_msg_buf *ub, st
 static int ubusd_acl_recv(struct ubus_client *cl, struct ubus_msg_buf *ub, const char *method, struct blob_attr *msg)
 {
 	if (!strcmp(method, "query"))
-		return ubusd_reply_query(cl, ub, ubus_parse_msg(ub->data), msg);
+		return ubusd_reply_query(cl, ub, ubus_parse_msg(ub->data, blob_raw_len(ub->data)), msg);
 
 	return UBUS_STATUS_INVALID_COMMAND;
 }