file: use global exec timeout instead of own hardcoded limit

[project/rpcd.git] / file.c

diff --git a/file.c b/file.c
index 02fb72e3bb126773842ee3801266e86df49e2098..fbc099c43a8f2d4f4703038c50ef056ef724ab2e 100644 (file)
--- a/file.c
+++ b/file.c
@@ -2,6 +2,7 @@
  * rpcd - UBUS RPC server
  *
  *   Copyright (C) 2013-2014 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2016 Luka Perkov <luka@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
@@ -38,7 +39,6 @@
 
 /* limit of regular files and command output data */
 #define RPC_FILE_MAX_SIZE              (4096 * 64)
-#define RPC_FILE_MAX_RUNTIME   (3 * 1000)
 
 #define ustream_for_each_read_buffer(stream, ptr, len) \
        for (ptr = ustream_get_read_buf(stream, &len);     \
@@ -93,6 +93,8 @@ static const struct blobmsg_policy rpc_file_rb_policy[__RPC_F_RB_MAX] = {
 enum {
        RPC_F_RW_PATH,
        RPC_F_RW_DATA,
+       RPC_F_RW_APPEND,
+       RPC_F_RW_MODE,
        RPC_F_RW_BASE64,
        __RPC_F_RW_MAX,
 };
@@ -100,6 +102,8 @@ enum {
 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 },
+       [RPC_F_RW_APPEND] = { .name = "append", .type = BLOBMSG_TYPE_BOOL  },
+       [RPC_F_RW_MODE]   = { .name = "mode",   .type = BLOBMSG_TYPE_INT32  },
        [RPC_F_RW_BASE64] = { .name = "base64", .type = BLOBMSG_TYPE_BOOL   },
 };
 
@@ -245,7 +249,7 @@ rpc_file_read(struct ubus_context *ctx, struct ubus_object *obj,
                }
        }
 
-       *(wbuf + len) = 0;
+       *(wbuf + len) = '\0';
        blobmsg_add_string_buffer(&buf);
 
        ubus_send_reply(ctx, req, buf.head);
@@ -263,9 +267,11 @@ rpc_file_write(struct ubus_context *ctx, struct ubus_object *obj,
                struct blob_attr *msg)
 {
        struct blob_attr *tb[__RPC_F_RW_MAX];
+       int append = O_TRUNC;
+       mode_t prev_mode, mode = 0666;
        int fd, rv = 0;
        void *data = NULL;
-       size_t data_len = 0;
+       ssize_t data_len = 0;
 
        blobmsg_parse(rpc_file_rw_policy, __RPC_F_RW_MAX, tb,
                      blob_data(msg), blob_len(msg));
@@ -276,7 +282,16 @@ rpc_file_write(struct ubus_context *ctx, struct ubus_object *obj,
        data = blobmsg_data(tb[RPC_F_RW_DATA]);
        data_len = blobmsg_data_len(tb[RPC_F_RW_DATA]) - 1;
 
-       if ((fd = open(blobmsg_data(tb[RPC_F_RW_PATH]), O_CREAT | O_TRUNC | O_WRONLY, 0666)) < 0)
+       if (tb[RPC_F_RW_APPEND] && blobmsg_get_bool(tb[RPC_F_RW_APPEND]))
+               append = O_APPEND;
+
+       if (tb[RPC_F_RW_MODE])
+               mode = blobmsg_get_u32(tb[RPC_F_RW_MODE]);
+
+       prev_mode = umask(0);
+       fd = open(blobmsg_data(tb[RPC_F_RW_PATH]), O_CREAT | O_WRONLY | append, mode);
+       umask(prev_mode);
+       if (fd < 0)
                return rpc_errno_status();
 
        if (tb[RPC_F_RW_BASE64] && blobmsg_get_bool(tb[RPC_F_RW_BASE64]))
@@ -675,7 +690,7 @@ rpc_file_exec_run(const char *cmd,
                uloop_process_add(&c->process);
 
                c->timeout.cb = rpc_file_exec_timeout_cb;
-               uloop_timeout_set(&c->timeout, RPC_FILE_MAX_RUNTIME);
+               uloop_timeout_set(&c->timeout, exec_timeout);
 
                close(opipe[1]);
                close(epipe[1]);