X-Git-Url: http://git.archive.openwrt.org/?p=project%2Frpcd.git;a=blobdiff_plain;f=uci.c;h=72ae5a67f99ae8f00784be8e2aa94eff5d3116e4;hp=f1dd120f910fba045098b064644d984a6ce10419;hb=23417e94d25570e6d62542bac46edd51e8e0243a;hpb=0239c345ca9d13971395c299313a2fb2694872cd diff --git a/uci.c b/uci.c index f1dd120..72ae5a6 100644 --- a/uci.c +++ b/uci.c @@ -23,13 +23,14 @@ #include #include +#include #include 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, @@ -271,8 +272,7 @@ rpc_uci_format_blob(struct blob_attr *v, const char **p) switch (blobmsg_type(v)) { case BLOBMSG_TYPE_STRING: - if (blobmsg_data_len(v) > 1) - *p = blobmsg_data(v); + *p = blobmsg_data(v); break; case BLOBMSG_TYPE_INT64: @@ -1124,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, @@ -1150,7 +1150,10 @@ rpc_uci_revert_commit(struct ubus_context *ctx, struct blob_attr *msg, bool comm else { if (!uci_lookup_ptr(cursor, &ptr, NULL, true) && ptr.p) + { uci_revert(cursor, &ptr); + uci_unload(cursor, ptr.p); + } } return rpc_uci_status(); @@ -1236,11 +1239,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; - if (!uci_load(cursor, ptr.package, &p)) { + if (!uci_load(cursor, config, &p)) { uci_commit(cursor, &p, false); uci_unload(cursor, p); } @@ -1299,7 +1299,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; } @@ -1362,7 +1362,7 @@ rpc_uci_apply(struct ubus_context *ctx, struct ubus_object *obj, if (tb[RPC_T_ROLLBACK]) rollback = blobmsg_get_bool(tb[RPC_T_ROLLBACK]); - if (apply_running && rollback) + if (apply_sid[0] && rollback) return UBUS_STATUS_PERMISSION_DENIED; if (!tb[RPC_T_SESSION]) @@ -1376,7 +1376,7 @@ 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); @@ -1392,6 +1392,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; @@ -1410,7 +1414,6 @@ rpc_uci_apply(struct ubus_context *ctx, struct ubus_object *obj, globfree(&gl); if (rollback) { - apply_running = true; apply_timer.cb = rpc_uci_apply_timeout; uloop_timeout_set(&apply_timer, timeout * 1000); apply_ctx = ctx; @@ -1425,14 +1428,28 @@ rpc_uci_confirm(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg) { - if (!apply_running) + 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); - apply_running = false; + memset(apply_sid, 0, sizeof(apply_sid)); apply_ctx = NULL; return 0; @@ -1447,12 +1464,11 @@ 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) + if (!apply_sid[0]) return UBUS_STATUS_NO_DATA; if (!tb[RPC_B_SESSION]) @@ -1460,16 +1476,13 @@ rpc_uci_rollback(struct ubus_context *ctx, struct ubus_object *obj, 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; - ret = rpc_uci_apply_access(sid, &gl); - if (ret) { - globfree(&gl); - return ret; - } - rpc_uci_do_rollback(ctx, sid, &gl); globfree(&gl); @@ -1477,6 +1490,21 @@ rpc_uci_rollback(struct ubus_context *ctx, struct ubus_object *obj, return 0; } +static int +rpc_uci_reload(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + char * const cmd[2] = { "/sbin/reload_config", NULL }; + + if (!fork()) { + /* wait for the RPC call to complete */ + sleep(2); + return execv(cmd[0], cmd); + } + + return 0; +} /* * Session destroy callback to purge associated delta directory. @@ -1525,6 +1553,7 @@ int rpc_uci_api_init(struct ubus_context *ctx) 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), + UBUS_METHOD_NOARG("reload_config", rpc_uci_reload), }; static struct ubus_object_type uci_type =