DGNum/rpcd
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

session: make object and function arguments of session.access optional, dump effective acls in this case

Browse source
This commit is contained in:
Jo-Philipp Wich 2014-01-19 19:45:25 +00:00
parent 49f6e218a4
commit 967d815022
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
session.c
View file

@ -580,22 +580,31 @@ rpc_handle_access(struct ubus_context *ctx, struct ubus_object *obj,
blobmsg_parse(perm_policy, __RPC_SP_MAX, tb, blob_data(msg), blob_len(msg)); blobmsg_parse(perm_policy, __RPC_SP_MAX, tb, blob_data(msg), blob_len(msg));
if (!tb[RPC_SP_SID] || !tb[RPC_SP_OBJECT] || !tb[RPC_SP_FUNCTION]) if (!tb[RPC_SP_SID])
return UBUS_STATUS_INVALID_ARGUMENT; return UBUS_STATUS_INVALID_ARGUMENT;
ses = rpc_session_get(blobmsg_data(tb[RPC_SP_SID])); ses = rpc_session_get(blobmsg_data(tb[RPC_SP_SID]));
if (!ses) if (!ses)
return UBUS_STATUS_NOT_FOUND; return UBUS_STATUS_NOT_FOUND;
if (tb[RPC_SP_SCOPE])
scope = blobmsg_data(tb[RPC_SP_SCOPE]);
allow = rpc_session_acl_allowed(ses, scope,
blobmsg_data(tb[RPC_SP_OBJECT]),
blobmsg_data(tb[RPC_SP_FUNCTION]));
blob_buf_init(&buf, 0); blob_buf_init(&buf, 0);
blobmsg_add_u8(&buf, "access", allow);
if (tb[RPC_SP_OBJECT] && tb[RPC_SP_FUNCTION])
{
if (tb[RPC_SP_SCOPE])
scope = blobmsg_data(tb[RPC_SP_SCOPE]);
allow = rpc_session_acl_allowed(ses, scope,
blobmsg_data(tb[RPC_SP_OBJECT]),
blobmsg_data(tb[RPC_SP_FUNCTION]));
blobmsg_add_u8(&buf, "access", allow);
}
else
{
rpc_session_dump_acls(ses, &buf);
}
ubus_send_reply(ctx, req, buf.head); ubus_send_reply(ctx, req, buf.head);
return 0; return 0;