X-Git-Url: http://git.archive.openwrt.org/?p=project%2Frpcd.git;a=blobdiff_plain;f=uci.c;h=acbbfd808c6139f5e8b7a8768c53d6476dd8da27;hp=aba897ee330b43494826097a5d6e73998c6ced0f;hb=d99e8adc4fbcf9e7a0b36df05ee1bccbedd45a2a;hpb=07c2f0a9b1c7f79e81fa8a51cca5ecbe9eaf7293;ds=sidebyside

diff --git a/uci.c b/uci.c
index aba897e..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
@@ -16,11 +16,20 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "uci.h"
-#include "session.h"
+#include <libgen.h>
+#include <glob.h>
+
+#include <libubox/blobmsg.h>
+#include <libubox/blobmsg_json.h>
+
+#include <rpcd/uci.h>
+#include <rpcd/session.h>
 
 static struct blob_buf buf;
 static struct uci_context *cursor;
+static struct uloop_timeout apply_timer;
+static struct ubus_context *apply_ctx;
+static char apply_sid[RPC_SID_LEN + 1];
 
 enum {
 	RPC_G_CONFIG,
@@ -146,6 +155,30 @@ static const struct blobmsg_policy rpc_uci_config_policy[__RPC_C_MAX] = {
 	                                        .type = BLOBMSG_TYPE_STRING },
 };
 
+enum {
+	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_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 },
+};
+
+enum {
+	RPC_B_SESSION,
+	__RPC_B_MAX,
+};
+
+static const struct blobmsg_policy rpc_uci_rollback_policy[__RPC_B_MAX] = {
+	[RPC_B_SESSION]  = { .name = "ubus_rpc_session",
+	                                        .type = BLOBMSG_TYPE_STRING },
+};
+
 /*
  * Turn uci error state into ubus return code
  */
@@ -169,6 +202,28 @@ rpc_uci_status(void)
 }
 
 /*
+ * Setup per-session delta save directory. If the passed "sid" blob attribute
+ * pointer is NULL then the precedure was not invoked through the ubus-rpc so
+ * we do not perform session isolation and use the default save directory.
+ */
+static void
+rpc_uci_set_savedir(struct blob_attr *sid)
+{
+	char path[PATH_MAX];
+
+	if (!sid)
+	{
+		uci_set_savedir(cursor, "/tmp/.uci");
+		return;
+	}
+
+	snprintf(path, sizeof(path) - 1,
+	         RPC_UCI_SAVEDIR_PREFIX "%s", blobmsg_get_string(sid));
+
+	uci_set_savedir(cursor, path);
+}
+
+/*
  * Test read access to given config. If the passed "sid" blob attribute pointer
  * is NULL then the precedure was not invoked through the ubus-rpc so we do not
  * perform access control and always assume true.
@@ -176,6 +231,8 @@ rpc_uci_status(void)
 static bool
 rpc_uci_read_access(struct blob_attr *sid, struct blob_attr *config)
 {
+	rpc_uci_set_savedir(sid);
+
 	if (!sid)
 		return true;
 
@@ -191,6 +248,8 @@ rpc_uci_read_access(struct blob_attr *sid, struct blob_attr *config)
 static bool
 rpc_uci_write_access(struct blob_attr *sid, struct blob_attr *config)
 {
+	rpc_uci_set_savedir(sid);
+
 	if (!sid)
 		return true;
 
@@ -461,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;
@@ -479,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])
 	{
@@ -518,13 +578,28 @@ 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,
             struct blob_attr *msg)
@@ -547,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])
@@ -605,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();
 }
@@ -628,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;
@@ -678,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])
 	{
@@ -706,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();
 }
@@ -785,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])
 	{
@@ -818,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();
 }
@@ -851,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;
@@ -871,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();
 }
@@ -899,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)
 	{
@@ -919,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();
 }
@@ -971,46 +1028,105 @@ 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
+rpc_uci_trigger_event(struct ubus_context *ctx, const char *config)
+{
+	char *pkg = strdup(config);
+	static struct blob_buf b;
+	uint32_t id;
+
+	if (!ubus_lookup_id(ctx, "service", &id)) {
+		void *c;
+
+		blob_buf_init(&b, 0);
+		blobmsg_add_string(&b, "type", "config.change");
+		c = blobmsg_open_table(&b, "data");
+		blobmsg_add_string(&b, "package", pkg);
+		blobmsg_close_table(&b, c);
+		ubus_invoke(ctx, id, "event", b.head, NULL, 0, 1000);
+	}
+	free(pkg);
 }
 
 static int
-rpc_uci_revert_commit(struct blob_attr *msg, bool commit)
+rpc_uci_revert_commit(struct ubus_context *ctx, struct blob_attr *msg, bool commit)
 {
 	struct blob_attr *tb[__RPC_C_MAX];
 	struct uci_package *p = NULL;
 	struct uci_ptr ptr = { 0 };
 
+	if (apply_sid[0])
+		return UBUS_STATUS_PERMISSION_DENIED;
+
 	blobmsg_parse(rpc_uci_config_policy, __RPC_C_MAX, tb,
 	              blob_data(msg), blob_len(msg));
 
@@ -1024,12 +1140,11 @@ rpc_uci_revert_commit(struct blob_attr *msg, bool commit)
 
 	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]));
 		}
 	}
 	else
@@ -1046,7 +1161,7 @@ rpc_uci_revert(struct ubus_context *ctx, struct ubus_object *obj,
                struct ubus_request_data *req, const char *method,
                struct blob_attr *msg)
 {
-	return rpc_uci_revert_commit(msg, false);
+	return rpc_uci_revert_commit(ctx, msg, false);
 }
 
 static int
@@ -1054,7 +1169,7 @@ rpc_uci_commit(struct ubus_context *ctx, struct ubus_object *obj,
                struct ubus_request_data *req, const char *method,
                struct blob_attr *msg)
 {
-	return rpc_uci_revert_commit(msg, true);
+	return rpc_uci_revert_commit(ctx, msg, true);
 }
 
 static int
@@ -1085,19 +1200,341 @@ out:
 }
 
 
+/*
+ * Remove given delta save directory (if any).
+ */
+static void
+rpc_uci_purge_dir(const char *path)
+{
+	DIR *d;
+	struct stat s;
+	struct dirent *e;
+	char file[PATH_MAX];
+
+	if (stat(path, &s) || !S_ISDIR(s.st_mode))
+		return;
+
+	if ((d = opendir(path)) != NULL)
+	{
+		while ((e = readdir(d)) != NULL)
+		{
+			snprintf(file, sizeof(file) - 1, "%s/%s", path, e->d_name);
+
+			if (stat(file, &s) || !S_ISREG(s.st_mode))
+				continue;
+
+			unlink(file);
+		}
+
+		closedir(d);
+
+		rmdir(path);
+	}
+}
+
+static int
+rpc_uci_apply_config(struct ubus_context *ctx, char *config)
+{
+	struct uci_package *p = NULL;
+
+	if (!uci_load(cursor, config, &p)) {
+		uci_commit(cursor, &p, false);
+		uci_unload(cursor, p);
+	}
+	rpc_uci_trigger_event(ctx, config);
+
+	return 0;
+}
+
+static void
+rpc_uci_copy_file(const char *src, const char *target, const char *file)
+{
+	char tmp[256];
+	FILE *in, *out;
+
+	snprintf(tmp, sizeof(tmp), "%s%s", src, file);
+	in = fopen(tmp, "rb");
+	snprintf(tmp, sizeof(tmp), "%s%s", target, file);
+	out = fopen(tmp, "wb+");
+	if (in && out)
+		while (!feof(in)) {
+			int len = fread(tmp, 1, sizeof(tmp), in);
+
+			if(len > 0)
+				fwrite(tmp, 1, len, out);
+		}
+	if(in)
+		fclose(in);
+	if(out)
+		fclose(out);
+}
+
+static void
+rpc_uci_do_rollback(struct ubus_context *ctx, const char *sid, glob_t *gl)
+{
+	int i;
+	char tmp[PATH_MAX];
+
+	if (sid) {
+		snprintf(tmp, sizeof(tmp), RPC_UCI_SAVEDIR_PREFIX "%s/", sid);
+		mkdir(tmp, 0700);
+	}
+
+	for (i = 0; i < gl->gl_pathc; i++) {
+		char *config = basename(gl->gl_pathv[i]);
+
+		if (*config == '.')
+			continue;
+
+		rpc_uci_copy_file(RPC_SNAPSHOT_FILES, RPC_UCI_DIR, config);
+		rpc_uci_apply_config(ctx, config);
+		if (sid)
+			rpc_uci_copy_file(RPC_SNAPSHOT_DELTA, tmp, config);
+	}
+
+	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;
+}
+
+static void
+rpc_uci_apply_timeout(struct uloop_timeout *t)
+{
+	glob_t gl;
+	char tmp[PATH_MAX];
+
+	snprintf(tmp, sizeof(tmp), "%s/*", RPC_SNAPSHOT_FILES);
+	if (glob(tmp, GLOB_PERIOD, NULL, &gl) < 0)
+		return;
+
+	rpc_uci_do_rollback(apply_ctx, NULL, &gl);
+}
+
+static int
+rpc_uci_apply_access(const char *sid, glob_t *gl)
+{
+	struct stat s;
+	int i, c = 0;
+
+	if (gl->gl_pathc < 3)
+		return UBUS_STATUS_NO_DATA;
+
+	for (i = 0; i < gl->gl_pathc; i++) {
+		char *config = basename(gl->gl_pathv[i]);
+
+		if (*config == '.')
+			continue;
+		if (stat(gl->gl_pathv[i], &s) || !s.st_size)
+			continue;
+		if (!rpc_session_access(sid, "uci", config, "write"))
+			return UBUS_STATUS_PERMISSION_DENIED;
+		c++;
+	}
+
+	if (!c)
+		return UBUS_STATUS_NO_DATA;
+
+	return 0;
+}
+
+static int
+rpc_uci_apply(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_T_MAX];
+	int timeout = RPC_APPLY_TIMEOUT;
+	char tmp[PATH_MAX];
+	bool rollback = false;
+	int ret, i;
+	char *sid;
+	glob_t gl;
+
+	blobmsg_parse(rpc_uci_apply_policy, __RPC_T_MAX, tb,
+	              blob_data(msg), blob_len(msg));
+
+	if (tb[RPC_T_ROLLBACK])
+		rollback = blobmsg_get_bool(tb[RPC_T_ROLLBACK]);
+
+	if (apply_sid[0] && rollback)
+		return UBUS_STATUS_PERMISSION_DENIED;
+
+	if (!tb[RPC_T_SESSION])
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	sid = blobmsg_data(tb[RPC_T_SESSION]);
+
+	if (tb[RPC_T_TIMEOUT])
+		timeout = blobmsg_get_u32(tb[RPC_T_TIMEOUT]);
+
+	rpc_uci_purge_dir(RPC_SNAPSHOT_FILES);
+	rpc_uci_purge_dir(RPC_SNAPSHOT_DELTA);
+
+	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 UBUS_STATUS_NOT_FOUND;
+
+		snprintf(tmp, sizeof(tmp), RPC_UCI_SAVEDIR_PREFIX "%s/", sid);
+
+		ret = rpc_uci_apply_access(sid, &gl);
+		if (ret) {
+			globfree(&gl);
+			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;
+
+			if (*config == '.')
+				continue;
+
+			if (stat(gl.gl_pathv[i], &s) || !s.st_size)
+				continue;
+
+			rpc_uci_copy_file(RPC_UCI_DIR, RPC_SNAPSHOT_FILES, config);
+			rpc_uci_copy_file(tmp, RPC_SNAPSHOT_DELTA, config);
+			rpc_uci_apply_config(ctx, config);
+		}
+
+		globfree(&gl);
+
+		if (rollback) {
+			apply_timer.cb = rpc_uci_apply_timeout;
+			uloop_timeout_set(&apply_timer, timeout * 1000);
+			apply_ctx = ctx;
+		}
+	}
+
+	return 0;
+}
+
+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;
+}
+
+static int
+rpc_uci_rollback(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 tmp[PATH_MAX];
+	glob_t gl;
+	char *sid;
+
+	blobmsg_parse(rpc_uci_rollback_policy, __RPC_B_MAX, tb,
+	              blob_data(msg), blob_len(msg));
+
+	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 UBUS_STATUS_NOT_FOUND;
+
+	rpc_uci_do_rollback(ctx, sid, &gl);
+
+	globfree(&gl);
+
+	return 0;
+}
+
+
+/*
+ * Session destroy callback to purge associated delta directory.
+ */
+static void
+rpc_uci_purge_savedir_cb(struct rpc_session *ses, void *priv)
+{
+	char path[PATH_MAX];
+
+	snprintf(path, sizeof(path) - 1, RPC_UCI_SAVEDIR_PREFIX "%s", ses->id);
+	rpc_uci_purge_dir(path);
+}
+
+/*
+ * Removes all delta directories which match the RPC_UCI_SAVEDIR_PREFIX.
+ * This is used to clean up garbage when starting rpcd.
+ */
+void rpc_uci_purge_savedirs(void)
+{
+	int i;
+	glob_t gl;
+
+	if (!glob(RPC_UCI_SAVEDIR_PREFIX "*", 0, NULL, &gl))
+	{
+		for (i = 0; i < gl.gl_pathc; i++)
+			rpc_uci_purge_dir(gl.gl_pathv[i]);
+
+		globfree(&gl);
+	}
+}
+
 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("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),
-		UBUS_METHOD("rename",  rpc_uci_rename,  rpc_uci_rename_policy),
-		UBUS_METHOD("order",   rpc_uci_order,   rpc_uci_order_policy),
-		UBUS_METHOD("changes", rpc_uci_changes, rpc_uci_config_policy),
-		UBUS_METHOD("revert",  rpc_uci_revert,  rpc_uci_config_policy),
-		UBUS_METHOD("commit",  rpc_uci_commit,  rpc_uci_config_policy),
+		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),
+		UBUS_METHOD("rename",   rpc_uci_rename,   rpc_uci_rename_policy),
+		UBUS_METHOD("order",    rpc_uci_order,    rpc_uci_order_policy),
+		UBUS_METHOD("changes",  rpc_uci_changes,  rpc_uci_config_policy),
+		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),
 	};
 
 	static struct ubus_object_type uci_type =
@@ -1110,10 +1547,16 @@ int rpc_uci_api_init(struct ubus_context *ctx)
 		.n_methods = ARRAY_SIZE(uci_methods),
 	};
 
+	static struct rpc_session_cb cb = {
+		.cb = rpc_uci_purge_savedir_cb
+	};
+
 	cursor = uci_alloc_context();
 
 	if (!cursor)
 		return UBUS_STATUS_UNKNOWN_ERROR;
 
+	rpc_session_destroy_cb(&cb);
+
 	return ubus_add_object(ctx, &obj);
 }