X-Git-Url: http://git.archive.openwrt.org/?p=project%2Frpcd.git;a=blobdiff_plain;f=session.c;h=3ed45197ab9d039e89a189f6bb5c152fa60c61a8;hp=a4ed5f354e6c0dc906c1f191c8d19c923a72c91f;hb=66a9bad1a73bc33c4c5a9a00de8dc8ad35bdfaf1;hpb=d0d1a92432699eaa2d97e871117230b1f809a2f9 diff --git a/session.c b/session.c index a4ed5f3..3ed4519 100644 --- a/session.c +++ b/session.c @@ -2,7 +2,7 @@ * rpcd - UBUS RPC server * * Copyright (C) 2013 Felix Fietkau - * Copyright (C) 2013 Jo-Philipp Wich + * Copyright (C) 2013-2014 Jo-Philipp Wich * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -26,6 +26,7 @@ #include #include #include +#include #ifdef HAVE_SHADOW #include @@ -39,12 +40,20 @@ static struct blob_buf buf; static LIST_HEAD(create_callbacks); static LIST_HEAD(destroy_callbacks); -static const struct blobmsg_policy new_policy = { - .name = "timeout", .type = BLOBMSG_TYPE_INT32 +enum { + RPC_SN_TIMEOUT, + __RPC_SN_MAX, +}; +static const struct blobmsg_policy new_policy[__RPC_SN_MAX] = { + [RPC_SN_TIMEOUT] = { .name = "timeout", .type = BLOBMSG_TYPE_INT32 }, }; -static const struct blobmsg_policy sid_policy = { - .name = "sid", .type = BLOBMSG_TYPE_STRING +enum { + RPC_SI_SID, + __RPC_SI_MAX, +}; +static const struct blobmsg_policy sid_policy[__RPC_SI_MAX] = { + [RPC_SI_SID] = { .name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING }, }; enum { @@ -53,7 +62,7 @@ enum { __RPC_SS_MAX, }; static const struct blobmsg_policy set_policy[__RPC_SS_MAX] = { - [RPC_SS_SID] = { .name = "sid", .type = BLOBMSG_TYPE_STRING }, + [RPC_SS_SID] = { .name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING }, [RPC_SS_VALUES] = { .name = "values", .type = BLOBMSG_TYPE_TABLE }, }; @@ -63,7 +72,7 @@ enum { __RPC_SG_MAX, }; static const struct blobmsg_policy get_policy[__RPC_SG_MAX] = { - [RPC_SG_SID] = { .name = "sid", .type = BLOBMSG_TYPE_STRING }, + [RPC_SG_SID] = { .name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING }, [RPC_SG_KEYS] = { .name = "keys", .type = BLOBMSG_TYPE_ARRAY }, }; @@ -74,7 +83,7 @@ enum { __RPC_SA_MAX, }; static const struct blobmsg_policy acl_policy[__RPC_SA_MAX] = { - [RPC_SA_SID] = { .name = "sid", .type = BLOBMSG_TYPE_STRING }, + [RPC_SA_SID] = { .name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING }, [RPC_SA_SCOPE] = { .name = "scope", .type = BLOBMSG_TYPE_STRING }, [RPC_SA_OBJECTS] = { .name = "objects", .type = BLOBMSG_TYPE_ARRAY }, }; @@ -87,7 +96,7 @@ enum { __RPC_SP_MAX, }; static const struct blobmsg_policy perm_policy[__RPC_SP_MAX] = { - [RPC_SP_SID] = { .name = "sid", .type = BLOBMSG_TYPE_STRING }, + [RPC_SP_SID] = { .name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING }, [RPC_SP_SCOPE] = { .name = "scope", .type = BLOBMSG_TYPE_STRING }, [RPC_SP_OBJECT] = { .name = "object", .type = BLOBMSG_TYPE_STRING }, [RPC_SP_FUNCTION] = { .name = "function", .type = BLOBMSG_TYPE_STRING }, @@ -101,7 +110,7 @@ enum { __RPC_DUMP_MAX, }; static const struct blobmsg_policy dump_policy[__RPC_DUMP_MAX] = { - [RPC_DUMP_SID] = { .name = "sid", .type = BLOBMSG_TYPE_STRING }, + [RPC_DUMP_SID] = { .name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING }, [RPC_DUMP_TIMEOUT] = { .name = "timeout", .type = BLOBMSG_TYPE_INT32 }, [RPC_DUMP_EXPIRES] = { .name = "expires", .type = BLOBMSG_TYPE_INT32 }, [RPC_DUMP_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE }, @@ -137,22 +146,28 @@ static const struct blobmsg_policy login_policy[__RPC_L_MAX] = { !fnmatch((_acl)->object, (_obj), FNM_NOESCAPE) && \ !fnmatch((_acl)->function, (_func), FNM_NOESCAPE)) -static void +static int rpc_random(char *dest) { unsigned char buf[16] = { 0 }; FILE *f; int i; + int ret; f = fopen("/dev/urandom", "r"); if (!f) - return; + return -1; - fread(buf, 1, sizeof(buf), f); + ret = fread(buf, 1, sizeof(buf), f); fclose(f); + if (ret < 0) + return ret; + for (i = 0; i < sizeof(buf); i++) sprintf(dest + (i<<1), "%02x", buf[i]); + + return 0; } static void @@ -203,16 +218,22 @@ rpc_session_dump_acls(struct rpc_session *ses, struct blob_buf *b) } static void -rpc_session_to_blob(struct rpc_session *ses) +rpc_session_to_blob(struct rpc_session *ses, bool acls) { void *c; blob_buf_init(&buf, 0); - blobmsg_add_string(&buf, "sid", ses->id); + blobmsg_add_string(&buf, "ubus_rpc_session", ses->id); blobmsg_add_u32(&buf, "timeout", ses->timeout); blobmsg_add_u32(&buf, "expires", uloop_timeout_remaining(&ses->t) / 1000); + if (acls) { + c = blobmsg_open_table(&buf, "acls"); + rpc_session_dump_acls(ses, &buf); + blobmsg_close_table(&buf, c); + } + c = blobmsg_open_table(&buf, "data"); rpc_session_dump_data(ses, &buf); blobmsg_close_table(&buf, c); @@ -222,7 +243,7 @@ static void rpc_session_dump(struct rpc_session *ses, struct ubus_context *ctx, struct ubus_request_data *req) { - rpc_session_to_blob(ses); + rpc_session_to_blob(ses, true); ubus_send_reply(ctx, req, buf.head); } @@ -301,7 +322,8 @@ rpc_session_create(int timeout) if (!ses) return NULL; - rpc_random(ses->id); + if (rpc_random(ses->id)) + return NULL; ses->timeout = timeout; @@ -337,7 +359,7 @@ rpc_handle_create(struct ubus_context *ctx, struct ubus_object *obj, struct blob_attr *tb; int timeout = RPC_DEFAULT_SESSION_TIMEOUT; - blobmsg_parse(&new_policy, 1, &tb, blob_data(msg), blob_len(msg)); + blobmsg_parse(new_policy, __RPC_SN_MAX, &tb, blob_data(msg), blob_len(msg)); if (tb) timeout = blobmsg_get_u32(tb); @@ -356,7 +378,7 @@ rpc_handle_list(struct ubus_context *ctx, struct ubus_object *obj, struct rpc_session *ses; struct blob_attr *tb; - blobmsg_parse(&sid_policy, 1, &tb, blob_data(msg), blob_len(msg)); + blobmsg_parse(sid_policy, __RPC_SI_MAX, &tb, blob_data(msg), blob_len(msg)); if (!tb) { avl_for_each_element(&sessions, ses, avl) @@ -380,7 +402,7 @@ uh_id_len(const char *str) } static int -rpc_session_grant(struct rpc_session *ses, struct ubus_context *ctx, +rpc_session_grant(struct rpc_session *ses, const char *scope, const char *object, const char *function) { struct rpc_session_acl *acl; @@ -431,7 +453,7 @@ rpc_session_grant(struct rpc_session *ses, struct ubus_context *ctx, } static int -rpc_session_revoke(struct rpc_session *ses, struct ubus_context *ctx, +rpc_session_revoke(struct rpc_session *ses, const char *scope, const char *object, const char *function) { struct rpc_session_acl *acl, *next; @@ -496,8 +518,8 @@ rpc_handle_acl(struct ubus_context *ctx, struct ubus_object *obj, const char *scope = "ubus"; int rem1, rem2; - int (*cb)(struct rpc_session *ses, struct ubus_context *ctx, - const char *scope, const char *object, const char *function); + int (*cb)(struct rpc_session *ses, + const char *scope, const char *object, const char *function); blobmsg_parse(acl_policy, __RPC_SA_MAX, tb, blob_data(msg), blob_len(msg)); @@ -517,17 +539,17 @@ rpc_handle_acl(struct ubus_context *ctx, struct ubus_object *obj, cb = rpc_session_revoke; if (!tb[RPC_SA_OBJECTS]) - return cb(ses, ctx, scope, NULL, NULL); + return cb(ses, scope, NULL, NULL); blobmsg_for_each_attr(attr, tb[RPC_SA_OBJECTS], rem1) { - if (blob_id(attr) != BLOBMSG_TYPE_ARRAY) + if (blobmsg_type(attr) != BLOBMSG_TYPE_ARRAY) continue; object = NULL; function = NULL; blobmsg_for_each_attr(sattr, attr, rem2) { - if (blob_id(sattr) != BLOBMSG_TYPE_STRING) + if (blobmsg_type(sattr) != BLOBMSG_TYPE_STRING) continue; if (!object) @@ -539,7 +561,7 @@ rpc_handle_acl(struct ubus_context *ctx, struct ubus_object *obj, } if (object && function) - cb(ses, ctx, scope, object, function); + cb(ses, scope, object, function); } return 0; @@ -574,33 +596,42 @@ 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)); - if (!tb[RPC_SP_SID] || !tb[RPC_SP_OBJECT] || !tb[RPC_SP_FUNCTION]) + if (!tb[RPC_SP_SID]) return UBUS_STATUS_INVALID_ARGUMENT; ses = rpc_session_get(blobmsg_data(tb[RPC_SP_SID])); if (!ses) return UBUS_STATUS_NOT_FOUND; - if (tb[RPC_SP_SCOPE]) - scope = blobmsg_data(tb[RPC_SP_SCOPE]); + blob_buf_init(&buf, 0); + + 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])); + 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); + } - blob_buf_init(&buf, 0); - blobmsg_add_u8(&buf, "access", allow); ubus_send_reply(ctx, req, buf.head); return 0; } static void -rpc_session_set(struct rpc_session *ses, const char *key, struct blob_attr *val) +rpc_session_set(struct rpc_session *ses, struct blob_attr *val) { struct rpc_session_data *data; - data = avl_find_element(&ses->data, key, data, avl); + data = avl_find_element(&ses->data, blobmsg_name(val), data, avl); if (data) { avl_delete(&ses->data, &data->avl); free(data); @@ -621,7 +652,7 @@ rpc_handle_set(struct ubus_context *ctx, struct ubus_object *obj, struct blob_attr *msg) { struct rpc_session *ses; - struct blob_attr *tb[__RPC_SA_MAX]; + struct blob_attr *tb[__RPC_SS_MAX]; struct blob_attr *attr; int rem; @@ -638,7 +669,7 @@ rpc_handle_set(struct ubus_context *ctx, struct ubus_object *obj, if (!blobmsg_name(attr)[0]) continue; - rpc_session_set(ses, blobmsg_name(attr), attr); + rpc_session_set(ses, attr); } return 0; @@ -651,7 +682,7 @@ rpc_handle_get(struct ubus_context *ctx, struct ubus_object *obj, { struct rpc_session *ses; struct rpc_session_data *data; - struct blob_attr *tb[__RPC_SA_MAX]; + struct blob_attr *tb[__RPC_SG_MAX]; struct blob_attr *attr; void *c; int rem; @@ -670,7 +701,7 @@ rpc_handle_get(struct ubus_context *ctx, struct ubus_object *obj, if (tb[RPC_SG_KEYS]) blobmsg_for_each_attr(attr, tb[RPC_SG_KEYS], rem) { - if (blob_id(attr) != BLOBMSG_TYPE_STRING) + if (blobmsg_type(attr) != BLOBMSG_TYPE_STRING) continue; data = avl_find_element(&ses->data, blobmsg_data(attr), data, avl); @@ -718,7 +749,7 @@ rpc_handle_unset(struct ubus_context *ctx, struct ubus_object *obj, } blobmsg_for_each_attr(attr, tb[RPC_SG_KEYS], rem) { - if (blob_id(attr) != BLOBMSG_TYPE_STRING) + if (blobmsg_type(attr) != BLOBMSG_TYPE_STRING) continue; data = avl_find_element(&ses->data, blobmsg_data(attr), data, avl); @@ -740,7 +771,7 @@ rpc_handle_destroy(struct ubus_context *ctx, struct ubus_object *obj, struct rpc_session *ses; struct blob_attr *tb; - blobmsg_parse(&sid_policy, 1, &tb, blob_data(msg), blob_len(msg)); + blobmsg_parse(sid_policy, __RPC_SI_MAX, &tb, blob_data(msg), blob_len(msg)); if (!tb) return UBUS_STATUS_INVALID_ARGUMENT; @@ -857,6 +888,7 @@ static bool rpc_login_test_permission(struct uci_section *s, const char *perm, const char *group) { + const char *p; struct uci_option *o; struct uci_element *e, *l; @@ -877,9 +909,30 @@ rpc_login_test_permission(struct uci_section *s, if (strcmp(o->e.name, perm)) continue; - uci_foreach_element(&o->v.list, l) - if (l->name && !fnmatch(l->name, group, 0)) + /* Match negative expressions first. If a negative expression matches + * the current group name then deny access. */ + uci_foreach_element(&o->v.list, l) { + p = l->name; + + if (!p || *p != '!') + continue; + + while (isspace(*++p)); + + if (!*p) + continue; + + if (!fnmatch(p, group, 0)) + return false; + } + + uci_foreach_element(&o->v.list, l) { + if (!l->name || !*l->name || *l->name == '!') + continue; + + if (!fnmatch(l->name, group, 0)) return true; + } } /* make sure that write permission implies read permission */ @@ -908,18 +961,18 @@ rpc_login_setup_acl_scope(struct rpc_session *ses, * ] * } */ - if (blob_id(acl_scope) == BLOBMSG_TYPE_TABLE) { + if (blobmsg_type(acl_scope) == BLOBMSG_TYPE_TABLE) { blobmsg_for_each_attr(acl_obj, acl_scope, rem) { - if (blob_id(acl_obj) != BLOBMSG_TYPE_ARRAY) + if (blobmsg_type(acl_obj) != BLOBMSG_TYPE_ARRAY) continue; blobmsg_for_each_attr(acl_func, acl_obj, rem2) { - if (blob_id(acl_func) != BLOBMSG_TYPE_STRING) + if (blobmsg_type(acl_func) != BLOBMSG_TYPE_STRING) continue; - rpc_session_grant(ses, NULL, blobmsg_name(acl_scope), - blobmsg_name(acl_obj), - blobmsg_data(acl_func)); + rpc_session_grant(ses, blobmsg_name(acl_scope), + blobmsg_name(acl_obj), + blobmsg_data(acl_func)); } } } @@ -934,14 +987,14 @@ rpc_login_setup_acl_scope(struct rpc_session *ses, * ... * ] */ - else if (blob_id(acl_scope) == BLOBMSG_TYPE_ARRAY) { + else if (blobmsg_type(acl_scope) == BLOBMSG_TYPE_ARRAY) { blobmsg_for_each_attr(acl_obj, acl_scope, rem) { - if (blob_id(acl_obj) != BLOBMSG_TYPE_STRING) + if (blobmsg_type(acl_obj) != BLOBMSG_TYPE_STRING) continue; - rpc_session_grant(ses, NULL, blobmsg_name(acl_scope), - blobmsg_data(acl_obj), - blobmsg_name(acl_perm)); + rpc_session_grant(ses, blobmsg_name(acl_scope), + blobmsg_data(acl_obj), + blobmsg_name(acl_perm)); } } } @@ -965,7 +1018,7 @@ rpc_login_setup_acl_file(struct rpc_session *ses, struct uci_section *login, blob_for_each_attr(acl_group, acl.head, rem) { /* Iterate permission objects in each access group object */ blobmsg_for_each_attr(acl_perm, acl_group, rem2) { - if (blob_id(acl_perm) != BLOBMSG_TYPE_TABLE) + if (blobmsg_type(acl_perm) != BLOBMSG_TYPE_TABLE) continue; /* Only "read" and "write" permissions are defined */ @@ -1006,9 +1059,9 @@ rpc_login_setup_acl_file(struct rpc_session *ses, struct uci_section *login, * access groups without having to test access of each single * // tuple defined in a group. */ - rpc_session_grant(ses, NULL, "access-group", - blobmsg_name(acl_group), - blobmsg_name(acl_perm)); + rpc_session_grant(ses, "access-group", + blobmsg_name(acl_group), + blobmsg_name(acl_perm)); } } } @@ -1032,6 +1085,31 @@ rpc_login_setup_acls(struct rpc_session *ses, struct uci_section *login) globfree(&gl); } +static struct rpc_session * +rpc_reclaim_apply_session(const char *expected_username) +{ + struct rpc_session_data *username; + struct rpc_session *ses; + + if (!apply_sid[0]) + return NULL; + + ses = rpc_session_get(apply_sid); + + if (!ses) + return NULL; + + username = avl_find_element(&ses->data, "username", username, avl); + + if (!username || blobmsg_type(username->attr) != BLOBMSG_TYPE_STRING) + return NULL; + + if (strcmp(blobmsg_get_string(username->attr), expected_username)) + return NULL; + + return ses; +} + static int rpc_handle_login(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, @@ -1069,7 +1147,15 @@ rpc_handle_login(struct ubus_context *ctx, struct ubus_object *obj, if (tb[RPC_L_TIMEOUT]) timeout = blobmsg_get_u32(tb[RPC_L_TIMEOUT]); - ses = rpc_session_create(timeout); + /* + * attempt to reclaim a pending apply session, but only accept it + * if the username matches, otherwise perform a new login + */ + + ses = rpc_reclaim_apply_session(blobmsg_get_string(tb[RPC_L_USERNAME])); + + if (!ses) + ses = rpc_session_create(timeout); if (!ses) { rv = UBUS_STATUS_UNKNOWN_ERROR; @@ -1078,7 +1164,7 @@ rpc_handle_login(struct ubus_context *ctx, struct ubus_object *obj, rpc_login_setup_acls(ses, login); - rpc_session_set(ses, "user", tb[RPC_L_USERNAME]); + rpc_session_set(ses, tb[RPC_L_USERNAME]); rpc_session_dump(ses, ctx, req); out: @@ -1160,6 +1246,8 @@ rpc_blob_from_file(const char *path) if (len != blob_pad_len(&head)) goto fail; + close(fd); + return attr; fail: @@ -1198,7 +1286,10 @@ rpc_session_from_blob(struct uci_context *uci, struct blob_attr *attr) ses->timeout = blobmsg_get_u32(tb[RPC_DUMP_TIMEOUT]); blobmsg_for_each_attr(data, tb[RPC_DUMP_DATA], rem) { - rpc_session_set(ses, blobmsg_name(data), data); + rpc_session_set(ses, data); + + if (blobmsg_type(data) != BLOBMSG_TYPE_STRING) + continue; if (!strcmp(blobmsg_name(data), "username")) user = blobmsg_get_string(data); @@ -1222,15 +1313,15 @@ int rpc_session_api_init(struct ubus_context *ctx) struct rpc_session *ses; static const struct ubus_method session_methods[] = { - UBUS_METHOD("create", rpc_handle_create, &new_policy), - UBUS_METHOD("list", rpc_handle_list, &sid_policy), + UBUS_METHOD("create", rpc_handle_create, new_policy), + UBUS_METHOD("list", rpc_handle_list, sid_policy), UBUS_METHOD("grant", rpc_handle_acl, acl_policy), UBUS_METHOD("revoke", rpc_handle_acl, acl_policy), UBUS_METHOD("access", rpc_handle_access, perm_policy), UBUS_METHOD("set", rpc_handle_set, set_policy), UBUS_METHOD("get", rpc_handle_get, get_policy), UBUS_METHOD("unset", rpc_handle_unset, get_policy), - UBUS_METHOD("destroy", rpc_handle_destroy, &sid_policy), + UBUS_METHOD("destroy", rpc_handle_destroy, sid_policy), UBUS_METHOD("login", rpc_handle_login, login_policy), }; @@ -1296,7 +1387,7 @@ void rpc_session_freeze(void) continue; snprintf(path, sizeof(path) - 1, RPC_SESSION_DIRECTORY "/%s", ses->id); - rpc_session_to_blob(ses); + rpc_session_to_blob(ses, false); rpc_blob_to_file(path, buf.head); } }