X-Git-Url: http://git.archive.openwrt.org/?p=project%2Frpcd.git;a=blobdiff_plain;f=file.c;h=9a3dfd8b3d60b0992a1fc3a86db78462034b8356;hp=b1cfe99d5c55dce11272d06ce0a76aa407db5243;hb=b65f6a844f920eb19f7d05d2ee93819b72021057;hpb=11f37e28898b12bf53d8df6272fa28c48d79a96b diff --git a/file.c b/file.c index b1cfe99..9a3dfd8 100644 --- a/file.c +++ b/file.c @@ -1,7 +1,7 @@ /* * rpcd - UBUS RPC server * - * Copyright (C) 2013 Jo-Philipp Wich + * Copyright (C) 2013-2014 Jo-Philipp Wich * * 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 @@ #include #include -#include "plugin.h" +#include /* limit of sys & proc files */ #define RPC_FILE_MIN_SIZE (128) @@ -69,14 +69,23 @@ struct rpc_file_exec_context { static struct blob_buf buf; enum { - RPC_F_PATH, - RPC_F_DATA, - __RPC_F_MAX, + RPC_F_R_PATH, + __RPC_F_R_MAX, }; -static const struct blobmsg_policy rpc_file_policy[__RPC_F_MAX] = { - [RPC_F_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING }, - [RPC_F_DATA] = { .name = "data", .type = BLOBMSG_TYPE_STRING }, +static const struct blobmsg_policy rpc_file_r_policy[__RPC_F_R_MAX] = { + [RPC_F_R_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING }, +}; + +enum { + RPC_F_RW_PATH, + RPC_F_RW_DATA, + __RPC_F_RW_MAX, +}; + +static const struct blobmsg_policy rpc_file_rw_policy[__RPC_F_RW_MAX] = { + [RPC_F_RW_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING }, + [RPC_F_RW_DATA] = { .name = "data", .type = BLOBMSG_TYPE_STRING }, }; enum { @@ -87,7 +96,7 @@ enum { }; static const struct blobmsg_policy rpc_exec_policy[__RPC_E_MAX] = { - [RPC_E_CMD] = { .name = "command", .type = BLOBMSG_TYPE_STRING }, + [RPC_E_CMD] = { .name = "command", .type = BLOBMSG_TYPE_STRING }, [RPC_E_PARM] = { .name = "params", .type = BLOBMSG_TYPE_ARRAY }, [RPC_E_ENV] = { .name = "env", .type = BLOBMSG_TYPE_TABLE }, }; @@ -129,17 +138,17 @@ rpc_errno_status(void) static struct blob_attr ** rpc_check_path(struct blob_attr *msg, char **path, struct stat *s) { - static struct blob_attr *tb[__RPC_F_MAX]; + static struct blob_attr *tb[__RPC_F_R_MAX]; - blobmsg_parse(rpc_file_policy, __RPC_F_MAX, tb, blob_data(msg), blob_len(msg)); + blobmsg_parse(rpc_file_r_policy, __RPC_F_R_MAX, tb, blob_data(msg), blob_len(msg)); - if (!tb[RPC_F_PATH]) + if (!tb[RPC_F_R_PATH]) { errno = EINVAL; return NULL; } - *path = blobmsg_data(tb[RPC_F_PATH]); + *path = blobmsg_data(tb[RPC_F_R_PATH]); if (stat(*path, s)) return NULL; @@ -190,6 +199,7 @@ rpc_file_read(struct ubus_context *ctx, struct ubus_object *obj, blobmsg_add_string_buffer(&buf); ubus_send_reply(ctx, req, buf.head); + blob_buf_free(&buf); rv = UBUS_STATUS_OK; out: @@ -203,21 +213,25 @@ rpc_file_write(struct ubus_context *ctx, struct ubus_object *obj, struct blob_attr *msg) { int fd; - char *path; - struct stat s; - struct blob_attr **tb; + struct blob_attr *tb[__RPC_F_RW_MAX]; - if (!(tb = rpc_check_path(msg, &path, &s))) - return rpc_errno_status(); + blobmsg_parse(rpc_file_rw_policy, __RPC_F_RW_MAX, tb, + blob_data(msg), blob_len(msg)); - if (!tb[RPC_F_DATA]) + if (!tb[RPC_F_RW_PATH] || !tb[RPC_F_RW_DATA]) return UBUS_STATUS_INVALID_ARGUMENT; - if ((fd = open(path, O_WRONLY)) < 0) + if ((fd = open(blobmsg_data(tb[RPC_F_RW_PATH]), O_CREAT | O_TRUNC | O_WRONLY)) < 0) + return rpc_errno_status(); + + if (write(fd, blobmsg_data(tb[RPC_F_RW_DATA]), blobmsg_data_len(tb[RPC_F_RW_DATA])) < 0) + return rpc_errno_status(); + + if (fsync(fd) < 0) return rpc_errno_status(); - write(fd, blobmsg_data(tb[RPC_F_DATA]), blobmsg_data_len(tb[RPC_F_DATA])); close(fd); + sync(); return 0; } @@ -255,6 +269,7 @@ rpc_file_list(struct ubus_context *ctx, struct ubus_object *obj, blobmsg_close_array(&buf, c); ubus_send_reply(ctx, req, buf.head); + blob_buf_free(&buf); return 0; } @@ -294,6 +309,7 @@ rpc_file_stat(struct ubus_context *ctx, struct ubus_object *obj, blobmsg_add_u32(&buf, "gid", s.st_gid); ubus_send_reply(ctx, req, buf.head); + blob_buf_free(&buf); return 0; } @@ -380,6 +396,7 @@ rpc_file_exec_reply(struct rpc_file_exec_context *c, int rv) rpc_ustream_to_blobmsg(&c->epipe.stream, "stderr"); ubus_send_reply(c->context, &c->request, buf.head); + blob_buf_free(&buf); } ubus_complete_deferred_request(c->context, &c->request, rv); @@ -457,7 +474,7 @@ rpc_file_exec_epipe_state_cb(struct ustream *s) static int rpc_file_exec_run(const char *cmd, - const struct blob_attr *arg, const struct blob_attr *env, + const struct blob_attr *arg, const struct blob_attr *env, struct ubus_context *ctx, struct ubus_request_data *req) { pid_t pid; @@ -580,7 +597,7 @@ rpc_file_exec(struct ubus_context *ctx, struct ubus_object *obj, return UBUS_STATUS_INVALID_ARGUMENT; return rpc_file_exec_run(blobmsg_data(tb[RPC_E_CMD]), - tb[RPC_E_PARM], tb[RPC_E_ENV], ctx, req); + tb[RPC_E_PARM], tb[RPC_E_ENV], ctx, req); } @@ -588,10 +605,10 @@ static int rpc_file_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx) { static const struct ubus_method file_methods[] = { - UBUS_METHOD("read", rpc_file_read, rpc_file_policy), - UBUS_METHOD("write", rpc_file_write, rpc_file_policy), - UBUS_METHOD("list", rpc_file_list, rpc_file_policy), - UBUS_METHOD("stat", rpc_file_stat, rpc_file_policy), + UBUS_METHOD("read", rpc_file_read, rpc_file_r_policy), + UBUS_METHOD("write", rpc_file_write, rpc_file_rw_policy), + UBUS_METHOD("list", rpc_file_list, rpc_file_r_policy), + UBUS_METHOD("stat", rpc_file_stat, rpc_file_r_policy), UBUS_METHOD("exec", rpc_file_exec, rpc_exec_policy), }; @@ -608,6 +625,6 @@ rpc_file_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx) return ubus_add_object(ctx, &obj); } -const struct rpc_plugin rpc_plugin = { +struct rpc_plugin rpc_plugin = { .init = rpc_file_api_init };