X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=uci.c;h=acbbfd808c6139f5e8b7a8768c53d6476dd8da27;hb=7fd4564b8acb60254817cb341b84c6468c8c6440;hp=62ca7fe0c9a375c46519d519f542c33b28f5aa24;hpb=6f78bfbbdf8534387d649dfbadd63b55c9b1c46d;p=project%2Frpcd.git

diff --git a/uci.c b/uci.c
index 62ca7fe..acbbfd8 100644
--- a/uci.c
+++ b/uci.c
@@ -1,7 +1,7 @@
 /*
  * rpcd - UBUS RPC server
  *
- *   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
@@ -29,7 +29,7 @@ static struct blob_buf buf;
 static struct uci_context *cursor;
 static struct uloop_timeout apply_timer;
 static struct ubus_context *apply_ctx;
-static bool apply_running;
+static char apply_sid[RPC_SID_LEN + 1];
 
 enum {
 	RPC_G_CONFIG,
@@ -156,14 +156,14 @@ static const struct blobmsg_policy rpc_uci_config_policy[__RPC_C_MAX] = {
 };
 
 enum {
-	RPC_T_COMMIT,
+	RPC_T_ROLLBACK,
 	RPC_T_TIMEOUT,
 	RPC_T_SESSION,
 	__RPC_T_MAX,
 };
 
 static const struct blobmsg_policy rpc_uci_apply_policy[__RPC_T_MAX] = {
-	[RPC_T_COMMIT]   = { .name = "commit",  .type = BLOBMSG_TYPE_BOOL },
+	[RPC_T_ROLLBACK] = { .name = "rollback", .type = BLOBMSG_TYPE_BOOL },
 	[RPC_T_TIMEOUT]  = { .name = "timeout", .type = BLOBMSG_TYPE_INT32 },
 	[RPC_T_SESSION]  = { .name = "ubus_rpc_session",
 	                                        .type = BLOBMSG_TYPE_STRING },
@@ -520,9 +520,8 @@ rpc_uci_dump_package(struct uci_package *p, const char *name,
 
 
 static int
-rpc_uci_get(struct ubus_context *ctx, struct ubus_object *obj,
-            struct ubus_request_data *req, const char *method,
-            struct blob_attr *msg)
+rpc_uci_getcommon(struct ubus_context *ctx, struct ubus_request_data *req,
+                  struct blob_attr *msg, bool use_state)
 {
 	struct blob_attr *tb[__RPC_G_MAX];
 	struct uci_package *p = NULL;
@@ -538,10 +537,12 @@ rpc_uci_get(struct ubus_context *ctx, struct ubus_object *obj,
 		return UBUS_STATUS_PERMISSION_DENIED;
 
 	ptr.package = blobmsg_data(tb[RPC_G_CONFIG]);
-	uci_load(cursor, ptr.package, &p);
 
-	if (!p)
-		goto out;
+	if (use_state)
+		uci_set_savedir(cursor, "/var/state");
+
+	if (uci_load(cursor, ptr.package, &p))
+		return rpc_uci_status();
 
 	if (tb[RPC_G_SECTION])
 	{
@@ -577,12 +578,27 @@ rpc_uci_get(struct ubus_context *ctx, struct ubus_object *obj,
 	ubus_send_reply(ctx, req, buf.head);
 
 out:
-	if (p)
-		uci_unload(cursor, p);
+	uci_unload(cursor, p);
 
 	return rpc_uci_status();
 }
 
+static int
+rpc_uci_get(struct ubus_context *ctx, struct ubus_object *obj,
+            struct ubus_request_data *req, const char *method,
+            struct blob_attr *msg)
+{
+	return rpc_uci_getcommon(ctx, req, msg, false);
+}
+
+static int
+rpc_uci_state(struct ubus_context *ctx, struct ubus_object *obj,
+              struct ubus_request_data *req, const char *method,
+              struct blob_attr *msg)
+{
+	return rpc_uci_getcommon(ctx, req, msg, true);
+}
+
 static int
 rpc_uci_add(struct ubus_context *ctx, struct ubus_object *obj,
             struct ubus_request_data *req, const char *method,
@@ -606,10 +622,8 @@ rpc_uci_add(struct ubus_context *ctx, struct ubus_object *obj,
 
 	ptr.package = blobmsg_data(tb[RPC_A_CONFIG]);
 
-	uci_load(cursor, ptr.package, &p);
-
-	if (!p)
-		goto out;
+	if (uci_load(cursor, ptr.package, &p))
+		return rpc_uci_status();
 
 	/* add named section */
 	if (tb[RPC_A_NAME])
@@ -664,8 +678,7 @@ rpc_uci_add(struct ubus_context *ctx, struct ubus_object *obj,
 	ubus_send_reply(ctx, req, buf.head);
 
 out:
-	if (p)
-		uci_unload(cursor, p);
+	uci_unload(cursor, p);
 
 	return rpc_uci_status();
 }
@@ -687,6 +700,7 @@ rpc_uci_merge_set(struct blob_attr *opt, struct uci_ptr *ptr)
 
 	ptr->o = NULL;
 	ptr->option = blobmsg_name(opt);
+	ptr->value = NULL;
 
 	if (rpc_uci_lookup(ptr) || !ptr->s)
 		return;
@@ -737,10 +751,9 @@ rpc_uci_set(struct ubus_context *ctx, struct ubus_object *obj,
 		return UBUS_STATUS_PERMISSION_DENIED;
 
 	ptr.package = blobmsg_data(tb[RPC_S_CONFIG]);
-	uci_load(cursor, ptr.package, &p);
 
-	if (!p)
-		goto out;
+	if (uci_load(cursor, ptr.package, &p))
+		return rpc_uci_status();
 
 	if (tb[RPC_S_SECTION])
 	{
@@ -765,10 +778,7 @@ rpc_uci_set(struct ubus_context *ctx, struct ubus_object *obj,
 	}
 
 	uci_save(cursor, p);
-
-out:
-	if (p)
-		uci_unload(cursor, p);
+	uci_unload(cursor, p);
 
 	return rpc_uci_status();
 }
@@ -844,10 +854,9 @@ rpc_uci_delete(struct ubus_context *ctx, struct ubus_object *obj,
 		return UBUS_STATUS_PERMISSION_DENIED;
 
 	ptr.package = blobmsg_data(tb[RPC_D_CONFIG]);
-	uci_load(cursor, ptr.package, &p);
 
-	if (!p)
-		goto out;
+	if (uci_load(cursor, ptr.package, &p))
+		return rpc_uci_status();
 
 	if (tb[RPC_D_SECTION])
 	{
@@ -877,10 +886,7 @@ rpc_uci_delete(struct ubus_context *ctx, struct ubus_object *obj,
 	}
 
 	uci_save(cursor, p);
-
-out:
-	if (p)
-		uci_unload(cursor, p);
+	uci_unload(cursor, p);
 
 	return rpc_uci_status();
 }
@@ -910,10 +916,8 @@ rpc_uci_rename(struct ubus_context *ctx, struct ubus_object *obj,
 	if (tb[RPC_R_OPTION])
 		ptr.option = blobmsg_data(tb[RPC_R_OPTION]);
 
-	uci_load(cursor, ptr.package, &p);
-
-	if (!p)
-		goto out;
+	if (uci_load(cursor, ptr.package, &p))
+		return rpc_uci_status();
 
 	if (uci_lookup_ptr(cursor, &ptr, NULL, true))
 		goto out;
@@ -930,8 +934,7 @@ rpc_uci_rename(struct ubus_context *ctx, struct ubus_object *obj,
 	uci_save(cursor, p);
 
 out:
-	if (p)
-		uci_unload(cursor, p);
+	uci_unload(cursor, p);
 
 	return rpc_uci_status();
 }
@@ -958,10 +961,8 @@ rpc_uci_order(struct ubus_context *ctx, struct ubus_object *obj,
 
 	ptr.package = blobmsg_data(tb[RPC_O_CONFIG]);
 
-	uci_load(cursor, ptr.package, &p);
-
-	if (!p)
-		goto out;
+	if (uci_load(cursor, ptr.package, &p))
+		return rpc_uci_status();
 
 	blobmsg_for_each_attr(cur, tb[RPC_O_SECTIONS], rem)
 	{
@@ -978,10 +979,7 @@ rpc_uci_order(struct ubus_context *ctx, struct ubus_object *obj,
 	}
 
 	uci_save(cursor, p);
-
-out:
-	if (p)
-		uci_unload(cursor, p);
+	uci_unload(cursor, p);
 
 	return rpc_uci_status();
 }
@@ -1030,37 +1028,73 @@ rpc_uci_changes(struct ubus_context *ctx, struct ubus_object *obj,
 	struct blob_attr *tb[__RPC_C_MAX];
 	struct uci_package *p = NULL;
 	struct uci_element *e;
-	void *c;
+	char **configs;
+	void *c, *d;
+	int i;
 
 	blobmsg_parse(rpc_uci_config_policy, __RPC_C_MAX, tb,
 	              blob_data(msg), blob_len(msg));
 
-	if (!tb[RPC_C_CONFIG])
-		return UBUS_STATUS_INVALID_ARGUMENT;
+	if (tb[RPC_C_CONFIG])
+	{
+		if (!rpc_uci_read_access(tb[RPC_C_SESSION], tb[RPC_C_CONFIG]))
+			return UBUS_STATUS_PERMISSION_DENIED;
 
-	if (!rpc_uci_read_access(tb[RPC_C_SESSION], tb[RPC_C_CONFIG]))
-		return UBUS_STATUS_PERMISSION_DENIED;
+		if (uci_load(cursor, blobmsg_data(tb[RPC_C_CONFIG]), &p))
+			return rpc_uci_status();
 
-	uci_load(cursor, blobmsg_data(tb[RPC_C_CONFIG]), &p);
+		blob_buf_init(&buf, 0);
+		c = blobmsg_open_array(&buf, "changes");
 
-	if (!p)
-		goto out;
+		uci_foreach_element(&p->saved_delta, e)
+			rpc_uci_dump_change(uci_to_delta(e));
+
+		blobmsg_close_array(&buf, c);
+
+		uci_unload(cursor, p);
+
+		ubus_send_reply(ctx, req, buf.head);
+
+		return rpc_uci_status();
+	}
+
+	rpc_uci_set_savedir(tb[RPC_C_SESSION]);
+
+	if (uci_list_configs(cursor, &configs))
+		return rpc_uci_status();
 
 	blob_buf_init(&buf, 0);
-	c = blobmsg_open_array(&buf, "changes");
 
-	uci_foreach_element(&p->saved_delta, e)
-		rpc_uci_dump_change(uci_to_delta(e));
+	c = blobmsg_open_table(&buf, "changes");
 
-	blobmsg_close_array(&buf, c);
+	for (i = 0; configs[i]; i++)
+	{
+		if (tb[RPC_C_SESSION] &&
+		    !rpc_session_access(blobmsg_data(tb[RPC_C_SESSION]), "uci",
+		                        configs[i], "read"))
+			continue;
 
-	ubus_send_reply(ctx, req, buf.head);
+		if (uci_load(cursor, configs[i], &p))
+			continue;
+
+		if (!uci_list_empty(&p->saved_delta))
+		{
+			d = blobmsg_open_array(&buf, configs[i]);
+
+			uci_foreach_element(&p->saved_delta, e)
+				rpc_uci_dump_change(uci_to_delta(e));
+
+			blobmsg_close_array(&buf, d);
+		}
 
-out:
-	if (p)
 		uci_unload(cursor, p);
+	}
 
-	return rpc_uci_status();
+	blobmsg_close_table(&buf, c);
+
+	ubus_send_reply(ctx, req, buf.head);
+
+	return 0;
 }
 
 static void
@@ -1090,7 +1124,7 @@ rpc_uci_revert_commit(struct ubus_context *ctx, struct blob_attr *msg, bool comm
 	struct uci_package *p = NULL;
 	struct uci_ptr ptr = { 0 };
 
-	if (!apply_running)
+	if (apply_sid[0])
 		return UBUS_STATUS_PERMISSION_DENIED;
 
 	blobmsg_parse(rpc_uci_config_policy, __RPC_C_MAX, tb,
@@ -1106,14 +1140,12 @@ rpc_uci_revert_commit(struct ubus_context *ctx, struct blob_attr *msg, bool comm
 
 	if (commit)
 	{
-		uci_load(cursor, ptr.package, &p);
-
-		if (p)
+		if (!uci_load(cursor, ptr.package, &p))
 		{
 			uci_commit(cursor, &p, false);
 			uci_unload(cursor, p);
+			rpc_uci_trigger_event(ctx, blobmsg_get_string(tb[RPC_C_CONFIG]));
 		}
-		rpc_uci_trigger_event(ctx, blobmsg_get_string(tb[RPC_C_CONFIG]));
 	}
 	else
 	{
@@ -1204,12 +1236,8 @@ static int
 rpc_uci_apply_config(struct ubus_context *ctx, char *config)
 {
 	struct uci_package *p = NULL;
-	struct uci_ptr ptr = { 0 };
-
-	ptr.package = config;
-	uci_load(cursor, ptr.package, &p);
 
-	if (p) {
+	if (!uci_load(cursor, config, &p)) {
 		uci_commit(cursor, &p, false);
 		uci_unload(cursor, p);
 	}
@@ -1268,7 +1296,7 @@ rpc_uci_do_rollback(struct ubus_context *ctx, const char *sid, glob_t *gl)
 	rpc_uci_purge_dir(RPC_SNAPSHOT_DELTA);
 
 	uloop_timeout_cancel(&apply_timer);
-	apply_running = false;
+	memset(apply_sid, 0, sizeof(apply_sid));
 	apply_ctx = NULL;
 }
 
@@ -1320,7 +1348,7 @@ rpc_uci_apply(struct ubus_context *ctx, struct ubus_object *obj,
 	struct blob_attr *tb[__RPC_T_MAX];
 	int timeout = RPC_APPLY_TIMEOUT;
 	char tmp[PATH_MAX];
-	bool commit = false;
+	bool rollback = false;
 	int ret, i;
 	char *sid;
 	glob_t gl;
@@ -1328,10 +1356,10 @@ rpc_uci_apply(struct ubus_context *ctx, struct ubus_object *obj,
 	blobmsg_parse(rpc_uci_apply_policy, __RPC_T_MAX, tb,
 	              blob_data(msg), blob_len(msg));
 
-	if (tb[RPC_T_COMMIT])
-		commit = blobmsg_get_bool(tb[RPC_T_COMMIT]);
+	if (tb[RPC_T_ROLLBACK])
+		rollback = blobmsg_get_bool(tb[RPC_T_ROLLBACK]);
 
-	if (apply_running && !commit)
+	if (apply_sid[0] && rollback)
 		return UBUS_STATUS_PERMISSION_DENIED;
 
 	if (!tb[RPC_T_SESSION])
@@ -1345,13 +1373,13 @@ rpc_uci_apply(struct ubus_context *ctx, struct ubus_object *obj,
 	rpc_uci_purge_dir(RPC_SNAPSHOT_FILES);
 	rpc_uci_purge_dir(RPC_SNAPSHOT_DELTA);
 
-	if (!apply_running) {
+	if (!apply_sid[0]) {
 		mkdir(RPC_SNAPSHOT_FILES, 0700);
 		mkdir(RPC_SNAPSHOT_DELTA, 0700);
 
 		snprintf(tmp, sizeof(tmp), RPC_UCI_SAVEDIR_PREFIX "%s/*", sid);
 		if (glob(tmp, GLOB_PERIOD, NULL, &gl) < 0)
-			return -1;
+			return UBUS_STATUS_NOT_FOUND;
 
 		snprintf(tmp, sizeof(tmp), RPC_UCI_SAVEDIR_PREFIX "%s/", sid);
 
@@ -1361,6 +1389,10 @@ rpc_uci_apply(struct ubus_context *ctx, struct ubus_object *obj,
 			return ret;
 		}
 
+		/* copy SID early because rpc_uci_apply_config() will clobber buf */
+		if (rollback)
+			strncpy(apply_sid, sid, RPC_SID_LEN);
+
 		for (i = 0; i < gl.gl_pathc; i++) {
 			char *config = basename(gl.gl_pathv[i]);
 			struct stat s;
@@ -1378,20 +1410,44 @@ rpc_uci_apply(struct ubus_context *ctx, struct ubus_object *obj,
 
 		globfree(&gl);
 
-		apply_running = true;
-		apply_timer.cb = rpc_uci_apply_timeout;
-		uloop_timeout_set(&apply_timer, timeout * 1000);
-		apply_ctx = ctx;
+		if (rollback) {
+			apply_timer.cb = rpc_uci_apply_timeout;
+			uloop_timeout_set(&apply_timer, timeout * 1000);
+			apply_ctx = ctx;
+		}
 	}
 
-	if (apply_running && commit) {
-		rpc_uci_purge_dir(RPC_SNAPSHOT_FILES);
-		rpc_uci_purge_dir(RPC_SNAPSHOT_DELTA);
+	return 0;
+}
 
-		uloop_timeout_cancel(&apply_timer);
-		apply_running = false;
-		apply_ctx = NULL;
-	}
+static int
+rpc_uci_confirm(struct ubus_context *ctx, struct ubus_object *obj,
+                struct ubus_request_data *req, const char *method,
+                struct blob_attr *msg)
+{
+	struct blob_attr *tb[__RPC_B_MAX];
+	char *sid;
+
+	blobmsg_parse(rpc_uci_rollback_policy, __RPC_B_MAX, tb,
+	              blob_data(msg), blob_len(msg));
+
+	if (!tb[RPC_B_SESSION])
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	sid = blobmsg_data(tb[RPC_B_SESSION]);
+
+	if (!apply_sid[0])
+		return UBUS_STATUS_NO_DATA;
+
+	if (strcmp(apply_sid, sid))
+		return UBUS_STATUS_PERMISSION_DENIED;
+
+	rpc_uci_purge_dir(RPC_SNAPSHOT_FILES);
+	rpc_uci_purge_dir(RPC_SNAPSHOT_DELTA);
+
+	uloop_timeout_cancel(&apply_timer);
+	memset(apply_sid, 0, sizeof(apply_sid));
+	apply_ctx = NULL;
 
 	return 0;
 }
@@ -1405,28 +1461,24 @@ rpc_uci_rollback(struct ubus_context *ctx, struct ubus_object *obj,
 	char tmp[PATH_MAX];
 	glob_t gl;
 	char *sid;
-	int ret;
 
 	blobmsg_parse(rpc_uci_rollback_policy, __RPC_B_MAX, tb,
 	              blob_data(msg), blob_len(msg));
 
-	if (!apply_running)
-		return UBUS_STATUS_PERMISSION_DENIED;
+	if (!apply_sid[0])
+		return UBUS_STATUS_NO_DATA;
 
 	if (!tb[RPC_B_SESSION])
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
 	sid = blobmsg_data(tb[RPC_B_SESSION]);
 
+	if (strcmp(apply_sid, sid))
+		return UBUS_STATUS_PERMISSION_DENIED;
+
 	snprintf(tmp, sizeof(tmp), "%s/*", RPC_SNAPSHOT_FILES);
 	if (glob(tmp, GLOB_PERIOD, NULL, &gl) < 0)
-		return -1;
-
-	ret = rpc_uci_apply_access(sid, &gl);
-	if (ret) {
-		globfree(&gl);
-		return ret;
-	}
+		return UBUS_STATUS_NOT_FOUND;
 
 	rpc_uci_do_rollback(ctx, sid, &gl);
 
@@ -1471,6 +1523,7 @@ int rpc_uci_api_init(struct ubus_context *ctx)
 	static const struct ubus_method uci_methods[] = {
 		{ .name = "configs", .handler = rpc_uci_configs },
 		UBUS_METHOD("get",      rpc_uci_get,      rpc_uci_get_policy),
+		UBUS_METHOD("state",    rpc_uci_state,    rpc_uci_get_policy),
 		UBUS_METHOD("add",      rpc_uci_add,      rpc_uci_add_policy),
 		UBUS_METHOD("set",      rpc_uci_set,      rpc_uci_set_policy),
 		UBUS_METHOD("delete",   rpc_uci_delete,   rpc_uci_delete_policy),
@@ -1480,6 +1533,7 @@ int rpc_uci_api_init(struct ubus_context *ctx)
 		UBUS_METHOD("revert",   rpc_uci_revert,   rpc_uci_config_policy),
 		UBUS_METHOD("commit",   rpc_uci_commit,   rpc_uci_config_policy),
 		UBUS_METHOD("apply",    rpc_uci_apply,    rpc_uci_apply_policy),
+		UBUS_METHOD("confirm",  rpc_uci_confirm,  rpc_uci_rollback_policy),
 		UBUS_METHOD("rollback", rpc_uci_rollback, rpc_uci_rollback_policy),
 	};