int ok;
};
+const char *ubusd_acl_dir = "/usr/share/acl.d";
static struct blob_buf bbuf;
static struct avl_tree ubusd_acls;
static int ubusd_acl_seq;
struct blob_attr *cur;
int rem;
- if (!cl->gid && !cl->uid)
+ if (!cl->uid)
return 0;
acl = avl_find_ge_element(&ubusd_acls, obj, acl, avl);
- while (acl) {
+ if (!acl)
+ return -1;
+
+ avl_for_element_to_last(&ubusd_acls, acl, acl, avl) {
int diff = ubusd_acl_match_path(obj, acl->avl.key, NULL);
if (diff)
break;
- if (ubusd_acl_match_cred(cl, acl)) {
- acl = avl_next_element(acl, avl);
+ if (ubusd_acl_match_cred(cl, acl))
continue;
- }
switch (type) {
case UBUS_ACL_PUBLISH:
return 0;
break;
}
- acl = avl_next_element(acl, avl);
}
return -1;
else
return;
- if (!tb[ACL_ACCESS] && !tb[ACL_PUBLISH] && !tb[ACL_INHERIT])
- return;
-
if (tb[ACL_ACCESS])
blobmsg_for_each_attr(cur, tb[ACL_ACCESS], rem)
ubusd_acl_add_access(file, cur);
struct stat st;
glob_t gl;
int j;
+ const char *suffix = "/*.json";
+ char *path = alloca(strlen(ubusd_acl_dir) + strlen(suffix) + 1);
- if (glob("/usr/share/acl.d/*.json", GLOB_NOESCAPE | GLOB_MARK, NULL, &gl))
+ sprintf(path, "%s%s", ubusd_acl_dir, suffix);
+ if (glob(path, GLOB_NOESCAPE | GLOB_MARK, NULL, &gl))
return;
vlist_update(&ubusd_acl_files);
if (!obj->path.key)
return;
+
acl = avl_find_ge_element(&ubusd_acls, obj->path.key, acl, avl);
- while (acl && !avl_is_last(&ubusd_acls, &acl->avl) &&
- !ubusd_acl_match_path(obj->path.key, acl->avl.key, NULL)) {
+ if (!acl)
+ return;
+
+ avl_for_element_to_last(&ubusd_acls, acl, acl, avl) {
+ void *c;
+
+ if (!acl->priv)
+ continue;
- if (acl->priv) {
- void *c = blobmsg_open_table(&b, NULL);
+ if (!ubusd_acl_match_path(obj->path.key, acl->avl.key, NULL))
+ continue;
- blobmsg_add_string(&b, "obj", obj->path.key);
- if (acl->user)
- blobmsg_add_string(&b, "user", acl->user);
- if (acl->group)
- blobmsg_add_string(&b, "group", acl->group);
+ c = blobmsg_open_table(&b, NULL);
+ blobmsg_add_string(&b, "obj", obj->path.key);
+ if (acl->user)
+ blobmsg_add_string(&b, "user", acl->user);
+ if (acl->group)
+ blobmsg_add_string(&b, "group", acl->group);
- if (acl->priv)
- blobmsg_add_field(&b, blobmsg_type(acl->priv), "acl",
- blobmsg_data(acl->priv), blobmsg_data_len(acl->priv));
+ blobmsg_add_field(&b, blobmsg_type(acl->priv), "acl",
+ blobmsg_data(acl->priv), blobmsg_data_len(acl->priv));
- blobmsg_close_table(&b, c);
- }
- acl = avl_next_element(acl, avl);
+ blobmsg_close_table(&b, c);
}
}
static int ubusd_reply_query(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr, struct blob_attr *msg)