file: add support for setting mode when writing files

Signed-off-by: Luka Perkov <luka@openwrt.org>

diff --git a/file.c b/file.c
index 02fb72e3bb126773842ee3801266e86df49e2098..4920f50b546392498e29e9393a29ed975bc8c921 100644 (file)
--- a/file.c
+++ b/file.c
@@ -93,6 +93,7 @@ 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_MODE,
        RPC_F_RW_BASE64,
        __RPC_F_RW_MAX,
 };
@@ -100,6 +101,7 @@ 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_MODE]   = { .name = "mode",   .type = BLOBMSG_TYPE_INT32  },
        [RPC_F_RW_BASE64] = { .name = "base64", .type = BLOBMSG_TYPE_BOOL   },
 };
 
@@ -263,6 +265,7 @@ rpc_file_write(struct ubus_context *ctx, struct ubus_object *obj,
                struct blob_attr *msg)
 {
        struct blob_attr *tb[__RPC_F_RW_MAX];
+       mode_t prev_mode, mode = 0666;
        int fd, rv = 0;
        void *data = NULL;
        size_t data_len = 0;
@@ -276,7 +279,13 @@ 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_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 | O_TRUNC, 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]))