X-Git-Url: http://git.archive.openwrt.org/?p=project%2Frpcd.git;a=blobdiff_plain;f=session.c;h=09f410486202ee6131c0a4b2c0a0d4e08561697b;hp=e390a9b02b387cf9195d613fffad24d2437df1fe;hb=d99e8adc4fbcf9e7a0b36df05ee1bccbedd45a2a;hpb=aa2afdb739b46533fa663237e3f3b6745b30e852

diff --git a/session.c b/session.c
index e390a9b..09f4104 100644
--- a/session.c
+++ b/session.c
@@ -2,7 +2,7 @@
  * rpcd - UBUS RPC server
  *
  *   Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013-2014 Jo-Philipp Wich <jow@openwrt.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,10 +17,20 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define _GNU_SOURCE	/* crypt() */
+
 #include <libubox/avl-cmp.h>
+#include <libubox/blobmsg.h>
 #include <libubox/utils.h>
 #include <libubus.h>
 #include <fnmatch.h>
+#include <glob.h>
+#include <uci.h>
+#include <limits.h>
+
+#ifdef HAVE_SHADOW
+#include <shadow.h>
+#endif
 
 #include <rpcd/session.h>
 
@@ -35,7 +45,7 @@ static const struct blobmsg_policy new_policy = {
 };
 
 static const struct blobmsg_policy sid_policy = {
-	.name = "sid", .type = BLOBMSG_TYPE_STRING
+	.name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING
 };
 
 enum {
@@ -44,7 +54,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 },
 };
 
@@ -54,7 +64,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 },
 };
 
@@ -65,7 +75,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 },
 };
@@ -78,7 +88,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 },
@@ -88,18 +98,28 @@ enum {
 	RPC_DUMP_SID,
 	RPC_DUMP_TIMEOUT,
 	RPC_DUMP_EXPIRES,
-	RPC_DUMP_ACLS,
 	RPC_DUMP_DATA,
 	__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_ACLS] = { .name = "acls", .type = BLOBMSG_TYPE_TABLE },
 	[RPC_DUMP_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
 };
 
+enum {
+	RPC_L_USERNAME,
+	RPC_L_PASSWORD,
+	RPC_L_TIMEOUT,
+	__RPC_L_MAX,
+};
+static const struct blobmsg_policy login_policy[__RPC_L_MAX] = {
+	[RPC_L_USERNAME] = { .name = "username", .type = BLOBMSG_TYPE_STRING },
+	[RPC_L_PASSWORD] = { .name = "password", .type = BLOBMSG_TYPE_STRING },
+	[RPC_L_TIMEOUT]  = { .name = "timeout", .type = BLOBMSG_TYPE_INT32 },
+};
+
 /*
  * Keys in the AVL tree contain all pattern characters up to the first wildcard.
  * To look up entries, start with the last entry that has a key less than or
@@ -184,19 +204,21 @@ 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);
 
-	c = blobmsg_open_table(&buf, "acls");
-	rpc_session_dump_acls(ses, &buf);
-	blobmsg_close_table(&buf, c);
+	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);
@@ -207,7 +229,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);
 }
@@ -215,7 +237,8 @@ rpc_session_dump(struct rpc_session *ses, struct ubus_context *ctx,
 static void
 rpc_touch_session(struct rpc_session *ses)
 {
-	uloop_timeout_set(&ses->t, ses->timeout * 1000);
+	if (ses->timeout > 0)
+		uloop_timeout_set(&ses->t, ses->timeout * 1000);
 }
 
 static void
@@ -364,7 +387,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;
@@ -415,7 +438,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;
@@ -480,8 +503,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));
 
@@ -501,17 +524,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)
@@ -523,7 +546,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;
@@ -558,22 +581,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));
 
-	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;
@@ -605,7 +637,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;
 
@@ -635,7 +667,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;
@@ -654,7 +686,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);
@@ -702,7 +734,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);
@@ -729,6 +761,9 @@ rpc_handle_destroy(struct ubus_context *ctx, struct ubus_object *obj,
 	if (!tb)
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
+	if (!strcmp(blobmsg_get_string(tb), RPC_DEFAULT_SESSION_ID))
+		return UBUS_STATUS_PERMISSION_DENIED;
+
 	ses = rpc_session_get(blobmsg_data(tb));
 	if (!ses)
 		return UBUS_STATUS_NOT_FOUND;
@@ -740,6 +775,359 @@ rpc_handle_destroy(struct ubus_context *ctx, struct ubus_object *obj,
 
 
 static bool
+rpc_login_test_password(const char *hash, const char *password)
+{
+	char *crypt_hash;
+
+	/* password is not set */
+	if (!hash || !*hash || !strcmp(hash, "!") || !strcmp(hash, "x"))
+	{
+		return true;
+	}
+
+	/* password hash refers to shadow/passwd */
+	else if (!strncmp(hash, "$p$", 3))
+	{
+#ifdef HAVE_SHADOW
+		struct spwd *sp = getspnam(hash + 3);
+
+		if (!sp)
+			return false;
+
+		return rpc_login_test_password(sp->sp_pwdp, password);
+#else
+		struct passwd *pw = getpwnam(hash + 3);
+
+		if (!pw)
+			return false;
+
+		return rpc_login_test_password(pw->pw_passwd, password);
+#endif
+	}
+
+	crypt_hash = crypt(password, hash);
+
+	return !strcmp(crypt_hash, hash);
+}
+
+static struct uci_section *
+rpc_login_test_login(struct uci_context *uci,
+                     const char *username, const char *password)
+{
+	struct uci_package *p = NULL;
+	struct uci_section *s;
+	struct uci_element *e;
+	struct uci_ptr ptr = { .package = "rpcd" };
+
+	uci_load(uci, ptr.package, &p);
+
+	if (!p)
+		return false;
+
+	uci_foreach_element(&p->sections, e)
+	{
+		s = uci_to_section(e);
+
+		if (strcmp(s->type, "login"))
+			continue;
+
+		ptr.section = s->e.name;
+		ptr.s = NULL;
+
+		/* test for matching username */
+		ptr.option = "username";
+		ptr.o = NULL;
+
+		if (uci_lookup_ptr(uci, &ptr, NULL, true))
+			continue;
+
+		if (ptr.o->type != UCI_TYPE_STRING)
+			continue;
+
+		if (strcmp(ptr.o->v.string, username))
+			continue;
+
+		/* If password is NULL, we're restoring ACLs for an existing session,
+		 * in this case do not check the password again. */
+		if (!password)
+			return ptr.s;
+
+		/* test for matching password */
+		ptr.option = "password";
+		ptr.o = NULL;
+
+		if (uci_lookup_ptr(uci, &ptr, NULL, true))
+			continue;
+
+		if (ptr.o->type != UCI_TYPE_STRING)
+			continue;
+
+		if (rpc_login_test_password(ptr.o->v.string, password))
+			return ptr.s;
+	}
+
+	return NULL;
+}
+
+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;
+
+	/* If the login section is not provided, we're setting up acls for the
+	 * default session, in this case uncondionally allow access to the
+	 * "unauthenticated" access group */
+	if (!s) {
+		return !strcmp(group, "unauthenticated");
+	}
+
+	uci_foreach_element(&s->options, e)
+	{
+		o = uci_to_option(e);
+
+		if (o->type != UCI_TYPE_LIST)
+			continue;
+
+		if (strcmp(o->e.name, perm))
+			continue;
+
+		/* 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 */
+	if (!strcmp(perm, "read"))
+		return rpc_login_test_permission(s, "write", group);
+
+	return false;
+}
+
+static void
+rpc_login_setup_acl_scope(struct rpc_session *ses,
+                          struct blob_attr *acl_perm,
+                          struct blob_attr *acl_scope)
+{
+	struct blob_attr *acl_obj, *acl_func;
+	int rem, rem2;
+
+	/*
+	 * Parse ACL scopes in table notation.
+	 *
+	 *	"<scope>": {
+	 *		"<object>": [
+	 *			"<function>",
+	 *			"<function>",
+	 *			...
+	 *		]
+	 *	}
+	 */
+	if (blobmsg_type(acl_scope) == BLOBMSG_TYPE_TABLE) {
+		blobmsg_for_each_attr(acl_obj, acl_scope, rem) {
+			if (blobmsg_type(acl_obj) != BLOBMSG_TYPE_ARRAY)
+				continue;
+
+			blobmsg_for_each_attr(acl_func, acl_obj, rem2) {
+				if (blobmsg_type(acl_func) != BLOBMSG_TYPE_STRING)
+					continue;
+
+				rpc_session_grant(ses, blobmsg_name(acl_scope),
+				                       blobmsg_name(acl_obj),
+				                       blobmsg_data(acl_func));
+			}
+		}
+	}
+
+	/*
+	 * Parse ACL scopes in array notation. The permission ("read" or "write")
+	 * will be used as function name for each object.
+	 *
+	 *	"<scope>": [
+	 *		"<object>",
+	 *		"<object>",
+	 *		...
+	 *	]
+	 */
+	else if (blobmsg_type(acl_scope) == BLOBMSG_TYPE_ARRAY) {
+		blobmsg_for_each_attr(acl_obj, acl_scope, rem) {
+			if (blobmsg_type(acl_obj) != BLOBMSG_TYPE_STRING)
+				continue;
+
+			rpc_session_grant(ses, blobmsg_name(acl_scope),
+			                       blobmsg_data(acl_obj),
+			                       blobmsg_name(acl_perm));
+		}
+	}
+}
+
+static void
+rpc_login_setup_acl_file(struct rpc_session *ses, struct uci_section *login,
+                         const char *path)
+{
+	struct blob_buf acl = { 0 };
+	struct blob_attr *acl_group, *acl_perm, *acl_scope;
+	int rem, rem2, rem3;
+
+	blob_buf_init(&acl, 0);
+
+	if (!blobmsg_add_json_from_file(&acl, path)) {
+		fprintf(stderr, "Failed to parse %s\n", path);
+		goto out;
+	}
+
+	/* Iterate access groups in toplevel object */
+	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 (blobmsg_type(acl_perm) != BLOBMSG_TYPE_TABLE)
+				continue;
+
+			/* Only "read" and "write" permissions are defined */
+			if (strcmp(blobmsg_name(acl_perm), "read") &&
+				strcmp(blobmsg_name(acl_perm), "write"))
+				continue;
+
+			/*
+			 * Check if the current user context specifies the current
+			 * "read" or "write" permission in the given access group.
+			 */
+			if (!rpc_login_test_permission(login, blobmsg_name(acl_perm),
+			                                      blobmsg_name(acl_group)))
+				continue;
+
+			/* Iterate scope objects within the permission object */
+			blobmsg_for_each_attr(acl_scope, acl_perm, rem3) {
+				/* Setup the scopes of the access group */
+				rpc_login_setup_acl_scope(ses, acl_perm, acl_scope);
+
+				/*
+				 * Add the access group itself as object to the "access-group"
+				 * meta scope and the the permission level ("read" or "write")
+				 * as function, so
+				 *	"<group>": {
+				 *		"<permission>": {
+				 *			"<scope>": ...
+				 *		}
+				 *	}
+				 * becomes
+				 *	"access-group": {
+				 *		"<group>": [
+				 *			"<permission>"
+				 *		]
+				 *	}
+				 *
+				 * This allows session clients to easily query the allowed
+				 * access groups without having to test access of each single
+				 * <scope>/<object>/<function> tuple defined in a group.
+				 */
+				rpc_session_grant(ses, "access-group",
+				                       blobmsg_name(acl_group),
+				                       blobmsg_name(acl_perm));
+			}
+		}
+	}
+
+out:
+	blob_buf_free(&acl);
+}
+
+static void
+rpc_login_setup_acls(struct rpc_session *ses, struct uci_section *login)
+{
+	int i;
+	glob_t gl;
+
+	if (glob(RPC_SESSION_ACL_DIR "/*.json", 0, NULL, &gl))
+		return;
+
+	for (i = 0; i < gl.gl_pathc; i++)
+		rpc_login_setup_acl_file(ses, login, gl.gl_pathv[i]);
+
+	globfree(&gl);
+}
+
+static int
+rpc_handle_login(struct ubus_context *ctx, struct ubus_object *obj,
+                 struct ubus_request_data *req, const char *method,
+                 struct blob_attr *msg)
+{
+	struct uci_context *uci = NULL;
+	struct uci_section *login;
+	struct rpc_session *ses;
+	struct blob_attr *tb[__RPC_L_MAX];
+	int timeout = RPC_DEFAULT_SESSION_TIMEOUT;
+	int rv = 0;
+
+	blobmsg_parse(login_policy, __RPC_L_MAX, tb, blob_data(msg), blob_len(msg));
+
+	if (!tb[RPC_L_USERNAME] || !tb[RPC_L_PASSWORD]) {
+		rv = UBUS_STATUS_INVALID_ARGUMENT;
+		goto out;
+	}
+
+	uci = uci_alloc_context();
+
+	if (!uci) {
+		rv = UBUS_STATUS_UNKNOWN_ERROR;
+		goto out;
+	}
+
+	login = rpc_login_test_login(uci, blobmsg_get_string(tb[RPC_L_USERNAME]),
+	                                  blobmsg_get_string(tb[RPC_L_PASSWORD]));
+
+	if (!login) {
+		rv = UBUS_STATUS_PERMISSION_DENIED;
+		goto out;
+	}
+
+	if (tb[RPC_L_TIMEOUT])
+		timeout = blobmsg_get_u32(tb[RPC_L_TIMEOUT]);
+
+	ses = rpc_session_create(timeout);
+
+	if (!ses) {
+		rv = UBUS_STATUS_UNKNOWN_ERROR;
+		goto out;
+	}
+
+	rpc_login_setup_acls(ses, login);
+
+	rpc_session_set(ses, "user", tb[RPC_L_USERNAME]);
+	rpc_session_dump(ses, ctx, req);
+
+out:
+	if (uci)
+		uci_free_context(uci);
+
+	return rv;
+}
+
+
+static bool
 rpc_validate_sid(const char *id)
 {
 	if (!id)
@@ -810,6 +1198,8 @@ rpc_blob_from_file(const char *path)
 	if (len != blob_pad_len(&head))
 		goto fail;
 
+	close(fd);
+
 	return attr;
 
 fail:
@@ -823,11 +1213,13 @@ fail:
 }
 
 static bool
-rpc_session_from_blob(struct blob_attr *attr)
+rpc_session_from_blob(struct uci_context *uci, struct blob_attr *attr)
 {
-	int i, rem, rem2, rem3;
+	int i, rem;
+	const char *user = NULL;
 	struct rpc_session *ses;
-	struct blob_attr *tb[__RPC_DUMP_MAX], *scope, *object, *function;
+	struct uci_section *login;
+	struct blob_attr *tb[__RPC_DUMP_MAX], *data;
 
 	blobmsg_parse(dump_policy, __RPC_DUMP_MAX, tb,
 	              blob_data(attr), blob_len(attr));
@@ -845,18 +1237,17 @@ rpc_session_from_blob(struct blob_attr *attr)
 
 	ses->timeout = blobmsg_get_u32(tb[RPC_DUMP_TIMEOUT]);
 
-	blobmsg_for_each_attr(scope, tb[RPC_DUMP_ACLS], rem) {
-		blobmsg_for_each_attr(object, scope, rem2) {
-			blobmsg_for_each_attr(function, object, rem3) {
-				rpc_session_grant(ses, NULL, blobmsg_name(scope),
-				                             blobmsg_name(object),
-				                             blobmsg_data(function));
-			}
-		}
+	blobmsg_for_each_attr(data, tb[RPC_DUMP_DATA], rem) {
+		rpc_session_set(ses, blobmsg_name(data), data);
+
+		if (!strcmp(blobmsg_name(data), "username"))
+			user = blobmsg_get_string(data);
 	}
 
-	blobmsg_for_each_attr(object, tb[RPC_DUMP_DATA], rem) {
-		rpc_session_set(ses, blobmsg_name(object), object);
+	if (uci && user) {
+		login = rpc_login_test_login(uci, user, NULL);
+		if (login)
+			rpc_login_setup_acls(ses, login);
 	}
 
 	avl_insert(&sessions, &ses->avl);
@@ -868,6 +1259,8 @@ rpc_session_from_blob(struct blob_attr *attr)
 
 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),
@@ -878,6 +1271,7 @@ int rpc_session_api_init(struct ubus_context *ctx)
 		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("login",   rpc_handle_login,   login_policy),
 	};
 
 	static struct ubus_object_type session_type =
@@ -892,6 +1286,15 @@ int rpc_session_api_init(struct ubus_context *ctx)
 
 	avl_init(&sessions, avl_strcmp, false, NULL);
 
+	/* setup the default session */
+	ses = rpc_session_new();
+
+	if (ses) {
+		strcpy(ses->id, RPC_DEFAULT_SESSION_ID);
+		rpc_login_setup_acls(ses, NULL);
+		avl_insert(&sessions, &ses->avl);
+	}
+
 	return ubus_add_object(ctx, &obj);
 }
 
@@ -928,8 +1331,12 @@ void rpc_session_freeze(void)
 		mkdir(RPC_SESSION_DIRECTORY, 0700);
 
 	avl_for_each_element(&sessions, ses, avl) {
+		/* skip default session */
+		if (!strcmp(ses->id, RPC_DEFAULT_SESSION_ID))
+			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);
 	}
 }
@@ -940,12 +1347,18 @@ void rpc_session_thaw(void)
 	char path[PATH_MAX];
 	struct dirent *e;
 	struct blob_attr *attr;
+	struct uci_context *uci;
 
 	d = opendir(RPC_SESSION_DIRECTORY);
 
 	if (!d)
 		return;
 
+	uci = uci_alloc_context();
+
+	if (!uci)
+		return;
+
 	while ((e = readdir(d)) != NULL) {
 		if (!rpc_validate_sid(e->d_name))
 			continue;
@@ -956,7 +1369,7 @@ void rpc_session_thaw(void)
 		attr = rpc_blob_from_file(path);
 
 		if (attr) {
-			rpc_session_from_blob(attr);
+			rpc_session_from_blob(uci, attr);
 			free(attr);
 		}
 
@@ -964,4 +1377,6 @@ void rpc_session_thaw(void)
 	}
 
 	closedir(d);
+
+	uci_free_context(uci);
 }