X-Git-Url: http://git.archive.openwrt.org/?p=project%2Frpcd.git;a=blobdiff_plain;f=uci.c;h=a49c8d0d4ad86ea0353a4399525314b30f63627f;hp=3fd187d65e8227f5debbe01436c68f302285dc40;hb=2f5a613718f5297febddb3ca7dc860ab6ed8c513;hpb=e0afdb10ae879d26d7f81d1dba8d47978a9a2aa9 diff --git a/uci.c b/uci.c index 3fd187d..a49c8d0 100644 --- a/uci.c +++ b/uci.c @@ -16,11 +16,20 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include +#include + +#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; 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_COMMIT, + 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_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 */ @@ -185,7 +218,7 @@ rpc_uci_set_savedir(struct blob_attr *sid) } snprintf(path, sizeof(path) - 1, - "/tmp/.uci-rpc-%s", (char *)blobmsg_data(sid)); + RPC_UCI_SAVEDIR_PREFIX "%s", blobmsg_get_string(sid)); uci_set_savedir(cursor, path); } @@ -487,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; @@ -505,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]) { @@ -544,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) @@ -573,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]) @@ -631,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(); } @@ -654,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; @@ -704,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]) { @@ -732,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(); } @@ -811,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]) { @@ -844,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(); } @@ -877,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; @@ -897,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(); } @@ -925,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) { @@ -945,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(); } @@ -1008,10 +1039,8 @@ rpc_uci_changes(struct ubus_context *ctx, struct ubus_object *obj, if (!rpc_uci_read_access(tb[RPC_C_SESSION], tb[RPC_C_CONFIG])) return UBUS_STATUS_PERMISSION_DENIED; - uci_load(cursor, blobmsg_data(tb[RPC_C_CONFIG]), &p); - - if (!p) - goto out; + if (uci_load(cursor, blobmsg_data(tb[RPC_C_CONFIG]), &p)) + return rpc_uci_status(); blob_buf_init(&buf, 0); c = blobmsg_open_array(&buf, "changes"); @@ -1023,20 +1052,41 @@ rpc_uci_changes(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 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_running) + return UBUS_STATUS_PERMISSION_DENIED; + blobmsg_parse(rpc_uci_config_policy, __RPC_C_MAX, tb, blob_data(msg), blob_len(msg)); @@ -1050,13 +1100,12 @@ 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 { @@ -1072,7 +1121,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 @@ -1080,7 +1129,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 @@ -1115,7 +1164,7 @@ out: * Remove given delta save directory (if any). */ static void -rpc_uci_purge_savedir(const char *path) +rpc_uci_purge_dir(const char *path) { DIR *d; struct stat s; @@ -1143,6 +1192,241 @@ rpc_uci_purge_savedir(const char *path) } } +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)) { + 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); + apply_running = false; + 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 commit = 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_COMMIT]) + commit = blobmsg_get_bool(tb[RPC_T_COMMIT]); + + if (apply_running && !commit) + 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_running) { + 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; + + snprintf(tmp, sizeof(tmp), RPC_UCI_SAVEDIR_PREFIX "%s/", sid); + + ret = rpc_uci_apply_access(sid, &gl); + if (ret) { + globfree(&gl); + return ret; + } + + 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); + + apply_running = true; + 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); + + uloop_timeout_cancel(&apply_timer); + apply_running = false; + 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; + 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 (!tb[RPC_B_SESSION]) + return UBUS_STATUS_INVALID_ARGUMENT; + + sid = blobmsg_data(tb[RPC_B_SESSION]); + + 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; + } + + rpc_uci_do_rollback(ctx, sid, &gl); + + globfree(&gl); + + return 0; +} + + /* * Session destroy callback to purge associated delta directory. */ @@ -1151,24 +1435,23 @@ rpc_uci_purge_savedir_cb(struct rpc_session *ses, void *priv) { char path[PATH_MAX]; - snprintf(path, sizeof(path) - 1, "/tmp/.uci-rpc-%s", ses->id); - rpc_uci_purge_savedir(path); + snprintf(path, sizeof(path) - 1, RPC_UCI_SAVEDIR_PREFIX "%s", ses->id); + rpc_uci_purge_dir(path); } /* - * Removes all delta directories which match the /tmp/.uci-rpc-* pattern. + * Removes all delta directories which match the RPC_UCI_SAVEDIR_PREFIX. * This is used to clean up garbage when starting rpcd. */ -static void -rpc_uci_purge_savedirs(void) +void rpc_uci_purge_savedirs(void) { int i; glob_t gl; - if (!glob("/tmp/.uci-rpc-*", 0, NULL, &gl)) + if (!glob(RPC_UCI_SAVEDIR_PREFIX "*", 0, NULL, &gl)) { for (i = 0; i < gl.gl_pathc; i++) - rpc_uci_purge_savedir(gl.gl_pathv[i]); + rpc_uci_purge_dir(gl.gl_pathv[i]); globfree(&gl); } @@ -1178,15 +1461,18 @@ 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("rollback", rpc_uci_rollback, rpc_uci_rollback_policy), }; static struct ubus_object_type uci_type = @@ -1208,7 +1494,6 @@ int rpc_uci_api_init(struct ubus_context *ctx) if (!cursor) return UBUS_STATUS_UNKNOWN_ERROR; - rpc_uci_purge_savedirs(); rpc_session_destroy_cb(&cb); return ubus_add_object(ctx, &obj);