file: increase minimum read buffer size to 4096 bytes
[oweals/rpcd.git] / file.c
diff --git a/file.c b/file.c
index b0bdd99397f42107dc7a72b928875a008ed1519f..b1adcb7c431bc55a770dea3508bd4fcbacae5adc 100644 (file)
--- a/file.c
+++ b/file.c
@@ -1,7 +1,8 @@
 /*
- * luci-rpcd - LuCI UBUS RPC server
+ * rpcd - UBUS RPC server
  *
- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   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
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define _GNU_SOURCE
+
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <libubus.h>
+#include <libubox/blobmsg.h>
+#include <libubox/md5.h>
+#include <libubox/ustream.h>
+#include <libubox/utils.h>
+
+#include <rpcd/plugin.h>
+
+/* limit of sys & proc files */
+#define RPC_FILE_MIN_SIZE              (4096)
+
+/* limit of regular files and command output data */
+#define RPC_FILE_MAX_SIZE              (4096 * 64)
+
+#define ustream_for_each_read_buffer(stream, ptr, len) \
+       for (ptr = ustream_get_read_buf(stream, &len);     \
+            ptr != NULL && len > 0;                       \
+            ustream_consume(stream, len), ptr = ustream_get_read_buf(stream, &len))
+
+#define ustream_declare(us, fd, name)                     \
+       us.stream.string_data   = true;                       \
+       us.stream.r.buffer_len  = 4096;                       \
+       us.stream.r.max_buffers = RPC_FILE_MAX_SIZE / 4096;   \
+       us.stream.notify_read   = rpc_file_##name##_read_cb;  \
+       us.stream.notify_state  = rpc_file_##name##_state_cb; \
+       ustream_fd_init(&us, fd);
+
+static const struct rpc_daemon_ops *ops;
+
+struct rpc_file_exec_context {
+       struct ubus_context *context;
+       struct ubus_request_data request;
+       struct uloop_timeout timeout;
+       struct uloop_process process;
+       struct ustream_fd opipe;
+       struct ustream_fd epipe;
+       int stat;
+};
 
-#include "file.h"
 
 static struct blob_buf buf;
+static char *canonpath;
+
+enum {
+       RPC_F_R_PATH,
+       RPC_F_R_SESSION,
+       __RPC_F_R_MAX,
+};
+
+static const struct blobmsg_policy rpc_file_R_policy[__RPC_F_R_MAX] = {
+       [RPC_F_R_PATH]    = { .name = "path", .type = BLOBMSG_TYPE_STRING },
+       [RPC_F_R_SESSION] = { .name = "ubus_rpc_session",
+                             .type = BLOBMSG_TYPE_STRING },
+};
+
+enum {
+       RPC_F_RB_PATH,
+       RPC_F_RB_BASE64,
+       RPC_F_RB_SESSION,
+       __RPC_F_RB_MAX,
+};
+
+static const struct blobmsg_policy rpc_file_RB_policy[__RPC_F_RB_MAX] = {
+       [RPC_F_RB_PATH]    = { .name = "path",   .type = BLOBMSG_TYPE_STRING },
+       [RPC_F_RB_BASE64]  = { .name = "base64", .type = BLOBMSG_TYPE_BOOL   },
+       [RPC_F_RB_SESSION] = { .name = "ubus_rpc_session",
+                              .type = BLOBMSG_TYPE_STRING },
+};
 
 enum {
-       RPC_F_PATH,
-       RPC_F_DATA,
-       __RPC_F_MAX,
+       RPC_F_RW_PATH,
+       RPC_F_RW_DATA,
+       RPC_F_RW_APPEND,
+       RPC_F_RW_MODE,
+       RPC_F_RW_BASE64,
+       RPC_F_RW_SESSION,
+       __RPC_F_RW_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_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   },
+       [RPC_F_RW_SESSION] = { .name = "ubus_rpc_session",
+                              .type = BLOBMSG_TYPE_STRING },
 };
 
 enum {
        RPC_E_CMD,
        RPC_E_PARM,
        RPC_E_ENV,
+       RPC_E_SESSION,
        __RPC_E_MAX,
 };
 
 static const struct blobmsg_policy rpc_exec_policy[__RPC_E_MAX] = {
-       [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  },
+       [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  },
+       [RPC_E_SESSION] = { .name = "ubus_rpc_session",
+                           .type = BLOBMSG_TYPE_STRING },
 };
 
 static const char *d_types[] = {
@@ -88,38 +168,135 @@ rpc_errno_status(void)
        }
 }
 
+static bool
+rpc_file_access(const struct blob_attr *sid,
+                const char *path, const char *perm)
+{
+       if (!sid)
+               return true;
+
+       return ops->session_access(blobmsg_data(sid), "file", path, perm);
+}
+
+static char *
+rpc_canonicalize_path(const char *path)
+{
+       char *cp;
+       const char *p;
+
+       if (path == NULL || *path == '\0')
+               return NULL;
+
+       if (canonpath != NULL)
+               free(canonpath);
+
+       canonpath = strdup(path);
+
+       if (canonpath == NULL)
+               return NULL;
+
+       /* normalize */
+       for (cp = canonpath, p = path; *p != '\0'; ) {
+               if (*p != '/')
+                       goto next;
+
+               /* skip repeating / */
+               if (p[1] == '/') {
+                       p++;
+                       continue;
+               }
+
+               /* /./ or /../ */
+               if (p[1] == '.') {
+                       /* skip /./ */
+                       if ((p[2] == '\0') || (p[2] == '/')) {
+                               p += 2;
+                               continue;
+                       }
+
+                       /* collapse /x/../ */
+                       if ((p[2] == '.') && ((p[3] == '\0') || (p[3] == '/'))) {
+                               while ((cp > canonpath) && (*--cp != '/'))
+                                       ;
+
+                               p += 3;
+                               continue;
+                       }
+               }
+
+next:
+               *cp++ = *p++;
+       }
+
+       /* remove trailing slash if not root / */
+       if ((cp > canonpath + 1) && (cp[-1] == '/'))
+               cp--;
+       else if (cp == canonpath)
+               *cp++ = '/';
+
+       *cp = '\0';
+
+       return canonpath;
+}
+
 static struct blob_attr **
-rpc_check_path(struct blob_attr *msg, char **path, struct stat *s)
+__rpc_check_path(const struct blobmsg_policy *policy, size_t policy_len,
+                 int policy_path_idx, int policy_sid_idx, const char *perm,
+                 struct blob_attr *msg, char **path, struct stat *s)
 {
-       static struct blob_attr *tb[__RPC_F_MAX];
+       static struct blob_attr *tb[__RPC_F_RW_MAX]; /* largest _MAX constant */
 
-       blobmsg_parse(rpc_file_policy, __RPC_F_MAX, tb, blob_data(msg), blob_len(msg));
+       blobmsg_parse(policy, policy_len, tb, blob_data(msg), blob_len(msg));
 
-       if (!tb[RPC_F_PATH])
+       if (!tb[policy_path_idx])
        {
                errno = EINVAL;
                return NULL;
        }
 
-       *path = blobmsg_data(tb[RPC_F_PATH]);
+       *path = rpc_canonicalize_path(blobmsg_get_string(tb[policy_path_idx]));
+
+       if (*path == NULL)
+       {
+               errno = ENOMEM;
+               return NULL;
+       }
+
+       if (!rpc_file_access(tb[policy_sid_idx], *path, perm))
+       {
+               errno = EACCES;
+               return NULL;
+       }
 
-       if (stat(*path, s))
+       if (s != NULL && stat(*path, s) != 0)
                return NULL;
 
        return tb;
 }
 
+#define rpc_check_path(msg, policy_selector, perm, path, s) \
+       __rpc_check_path(rpc_file_ ## policy_selector ## _policy, \
+               ARRAY_SIZE(rpc_file_ ## policy_selector ## _policy), \
+               RPC_F_ ## policy_selector ## _PATH, \
+               RPC_F_ ## policy_selector ## _SESSION, \
+               perm, msg, path, s)
+
 static int
 rpc_file_read(struct ubus_context *ctx, struct ubus_object *obj,
               struct ubus_request_data *req, const char *method,
               struct blob_attr *msg)
 {
-       int fd, rv, len;
+       struct blob_attr **tb;
+       bool base64 = false;
+       int fd, rv;
+       ssize_t len;
        char *path;
        struct stat s;
        char *wbuf;
 
-       if (!rpc_check_path(msg, &path, &s))
+       tb = rpc_check_path(msg, RB, "read", &path, &s);
+
+       if (tb == NULL)
                return rpc_errno_status();
 
        if (s.st_size >= RPC_FILE_MAX_SIZE)
@@ -134,7 +311,13 @@ rpc_file_read(struct ubus_context *ctx, struct ubus_object *obj,
 
        blob_buf_init(&buf, 0);
 
-       wbuf = blobmsg_alloc_string_buffer(&buf, "data", s.st_size + 1);
+       if (tb[RPC_F_RB_BASE64])
+               base64 = blobmsg_get_bool(tb[RPC_F_RB_BASE64]);
+
+       len = s.st_size + 1;
+       if (base64)
+               len = B64_ENCODE_LEN(s.st_size);
+       wbuf = blobmsg_alloc_string_buffer(&buf, "data", len);
 
        if (!wbuf)
        {
@@ -148,13 +331,33 @@ rpc_file_read(struct ubus_context *ctx, struct ubus_object *obj,
                goto out;
        }
 
-       *(wbuf + len) = 0;
+       if (base64)
+       {
+               uint8_t *data = calloc(len, sizeof(uint8_t));
+               if (!data)
+               {
+                       rv = UBUS_STATUS_UNKNOWN_ERROR;
+                       goto out;
+               }
+               memcpy(data, wbuf, len);
+
+               len = b64_encode(data, len, wbuf, B64_ENCODE_LEN(len));
+               free(data);
+               if (len < 0)
+               {
+                       rv = UBUS_STATUS_UNKNOWN_ERROR;
+                       goto out;
+               }
+       }
+
+       *(wbuf + len) = '\0';
        blobmsg_add_string_buffer(&buf);
 
        ubus_send_reply(ctx, req, buf.head);
        rv = UBUS_STATUS_OK;
 
 out:
+       blob_buf_free(&buf);
        close(fd);
        return rv;
 }
@@ -164,26 +367,121 @@ rpc_file_write(struct ubus_context *ctx, struct ubus_object *obj,
                struct ubus_request_data *req, const char *method,
                struct blob_attr *msg)
 {
-       int fd;
-       char *path;
-       struct stat s;
        struct blob_attr **tb;
+       int append = O_TRUNC;
+       mode_t prev_mode, mode = 0666;
+       int fd, rv = 0;
+       char *path = NULL;
+       void *data = NULL;
+       ssize_t data_len = 0;
+
+       tb = rpc_check_path(msg, RW, "write", &path, NULL);
 
-       if (!(tb = rpc_check_path(msg, &path, &s)))
+       if (tb == NULL)
                return rpc_errno_status();
 
-       if (!tb[RPC_F_DATA])
+       if (!tb[RPC_F_RW_DATA])
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-       if ((fd = open(path, O_WRONLY)) < 0)
+       data = blobmsg_data(tb[RPC_F_RW_DATA]);
+       data_len = blobmsg_data_len(tb[RPC_F_RW_DATA]) - 1;
+
+       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(path, O_CREAT | O_WRONLY | append, mode);
+       umask(prev_mode);
+       if (fd < 0)
                return rpc_errno_status();
 
-       write(fd, blobmsg_data(tb[RPC_F_DATA]), blobmsg_data_len(tb[RPC_F_DATA]));
+       if (tb[RPC_F_RW_BASE64] && blobmsg_get_bool(tb[RPC_F_RW_BASE64]))
+       {
+               data_len = b64_decode(data, data, data_len);
+               if (data_len < 0)
+               {
+                       rv = UBUS_STATUS_UNKNOWN_ERROR;
+                       goto out;
+               }
+       }
+
+       if (write(fd, data, data_len) < 0)
+               rv = -1;
+
+out:
+       if (fsync(fd) < 0)
+               rv = -1;
+
        close(fd);
+       sync();
+
+       if (rv)
+               return rpc_errno_status();
 
        return 0;
 }
 
+static int
+rpc_file_md5(struct ubus_context *ctx, struct ubus_object *obj,
+             struct ubus_request_data *req, const char *method,
+             struct blob_attr *msg)
+{
+       int rv, i;
+       char *path;
+       struct stat s;
+       uint8_t md5[16];
+       char *wbuf;
+
+       if (!rpc_check_path(msg, R, "read", &path, &s))
+               return rpc_errno_status();
+
+       if (!S_ISREG(s.st_mode))
+               return UBUS_STATUS_NOT_SUPPORTED;
+
+       if ((rv = md5sum(path, md5)) <= 0)
+               return rpc_errno_status();
+
+       blob_buf_init(&buf, 0);
+       wbuf = blobmsg_alloc_string_buffer(&buf, "md5", 33);
+
+       for (i = 0; i < 16; i++)
+               sprintf(wbuf + (i * 2), "%02x", (uint8_t) md5[i]);
+
+       blobmsg_add_string_buffer(&buf);
+       ubus_send_reply(ctx, req, buf.head);
+       blob_buf_free(&buf);
+
+       return UBUS_STATUS_OK;
+}
+
+static void
+_rpc_file_add_stat(struct stat *s)
+{
+       int type;
+
+       type = S_ISREG(s->st_mode) ? DT_REG :
+               S_ISDIR(s->st_mode) ? DT_DIR :
+                S_ISCHR(s->st_mode) ? DT_CHR :
+                 S_ISBLK(s->st_mode) ? DT_BLK :
+                  S_ISFIFO(s->st_mode) ? DT_FIFO :
+                   S_ISLNK(s->st_mode) ? DT_LNK :
+                    S_ISSOCK(s->st_mode) ? DT_SOCK :
+                     DT_UNKNOWN;
+
+       blobmsg_add_string(&buf, "type", d_types[type]);
+       blobmsg_add_u32(&buf, "size",  s->st_size);
+       blobmsg_add_u32(&buf, "mode",  s->st_mode);
+       blobmsg_add_u32(&buf, "atime", s->st_atime);
+       blobmsg_add_u32(&buf, "mtime", s->st_mtime);
+       blobmsg_add_u32(&buf, "ctime", s->st_ctime);
+       blobmsg_add_u32(&buf, "inode", s->st_ino);
+       blobmsg_add_u32(&buf, "uid",   s->st_uid);
+       blobmsg_add_u32(&buf, "gid",   s->st_gid);
+}
+
 static int
 rpc_file_list(struct ubus_context *ctx, struct ubus_object *obj,
               struct ubus_request_data *req, const char *method,
@@ -191,11 +489,11 @@ rpc_file_list(struct ubus_context *ctx, struct ubus_object *obj,
 {
        DIR *fd;
        void *c, *d;
-       char *path;
        struct stat s;
        struct dirent *e;
+       char *path, *entrypath;
 
-       if (!rpc_check_path(msg, &path, &s))
+       if (!rpc_check_path(msg, R, "list", &path, NULL))
                return rpc_errno_status();
 
        if ((fd = opendir(path)) == NULL)
@@ -209,14 +507,25 @@ rpc_file_list(struct ubus_context *ctx, struct ubus_object *obj,
                if (!strcmp(e->d_name, ".") || !strcmp(e->d_name, ".."))
                        continue;
 
-               d = blobmsg_open_table(&buf, NULL);
-               blobmsg_add_string(&buf, "name", e->d_name);
-               blobmsg_add_string(&buf, "type", d_types[e->d_type]);
-               blobmsg_close_table(&buf, d);
+               if (asprintf(&entrypath, "%s/%s", path, e->d_name) < 0)
+                       continue;
+
+               if (!stat(entrypath, &s))
+               {
+                       d = blobmsg_open_table(&buf, NULL);
+                       blobmsg_add_string(&buf, "name", e->d_name);
+                       _rpc_file_add_stat(&s);
+                       blobmsg_close_table(&buf, d);
+               }
+
+               free(entrypath);
        }
 
+       closedir(fd);
+
        blobmsg_close_array(&buf, c);
        ubus_send_reply(ctx, req, buf.head);
+       blob_buf_free(&buf);
 
        return 0;
 }
@@ -226,36 +535,88 @@ rpc_file_stat(struct ubus_context *ctx, struct ubus_object *obj,
               struct ubus_request_data *req, const char *method,
               struct blob_attr *msg)
 {
-       int type;
        char *path;
        struct stat s;
 
-       if (!rpc_check_path(msg, &path, &s))
+       if (!rpc_check_path(msg, R, "list", &path, &s))
                return rpc_errno_status();
 
        blob_buf_init(&buf, 0);
 
-       type = S_ISREG(s.st_mode) ? DT_REG :
-               S_ISDIR(s.st_mode) ? DT_DIR :
-                S_ISCHR(s.st_mode) ? DT_CHR :
-                 S_ISBLK(s.st_mode) ? DT_BLK :
-                  S_ISFIFO(s.st_mode) ? DT_FIFO :
-                   S_ISLNK(s.st_mode) ? DT_LNK :
-                    S_ISSOCK(s.st_mode) ? DT_SOCK :
-                     DT_UNKNOWN;
-
        blobmsg_add_string(&buf, "path", path);
-       blobmsg_add_string(&buf, "type", d_types[type]);
-       blobmsg_add_u32(&buf, "size",  s.st_size);
-       blobmsg_add_u32(&buf, "mode",  s.st_mode);
-       blobmsg_add_u32(&buf, "atime", s.st_atime);
-       blobmsg_add_u32(&buf, "mtime", s.st_mtime);
-       blobmsg_add_u32(&buf, "ctime", s.st_ctime);
-       blobmsg_add_u32(&buf, "inode", s.st_ino);
-       blobmsg_add_u32(&buf, "uid",   s.st_uid);
-       blobmsg_add_u32(&buf, "gid",   s.st_gid);
+       _rpc_file_add_stat(&s);
 
        ubus_send_reply(ctx, req, buf.head);
+       blob_buf_free(&buf);
+
+       return 0;
+}
+
+static int
+rpc_file_remove_recursive(const char *path);
+
+static int
+rpc_file_remove_recursive(const char *path)
+{
+       DIR *fd;
+       int err = 0;
+       struct stat s;
+       struct dirent *e;
+       char *entrypath;
+
+       if ((fd = opendir(path)) == NULL)
+               return rpc_errno_status();
+
+       for (e = readdir(fd); e != NULL && err == 0; e = readdir(fd))
+       {
+               if (!strcmp(e->d_name, ".") || !strcmp(e->d_name, ".."))
+                       continue;
+
+               if (asprintf(&entrypath, "%s/%s", path, e->d_name) >= 0)
+               {
+                       if (!lstat(entrypath, &s))
+                       {
+                               if (S_ISDIR(s.st_mode))
+                                       err = rpc_file_remove_recursive(entrypath);
+                               else if (unlink(entrypath))
+                                       err = rpc_errno_status();
+                       }
+
+                       free(entrypath);
+               }
+               else
+               {
+                       err = UBUS_STATUS_UNKNOWN_ERROR;
+               }
+       }
+
+       closedir(fd);
+
+       if (!err && rmdir(path))
+               return rpc_errno_status();
+
+       return err;
+}
+
+static int
+rpc_file_remove(struct ubus_context *ctx, struct ubus_object *obj,
+                struct ubus_request_data *req, const char *method,
+                struct blob_attr *msg)
+{
+       struct stat s;
+       char *path = NULL;
+
+       if (!rpc_check_path(msg, R, "write", &path, NULL))
+               return rpc_errno_status();
+
+       if (lstat(path, &s))
+               return rpc_errno_status();
+
+       if (S_ISDIR(s.st_mode))
+               return rpc_file_remove_recursive(path);
+
+       if (unlink(path))
+               return rpc_errno_status();
 
        return 0;
 }
@@ -342,6 +703,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);
@@ -417,21 +779,29 @@ rpc_file_exec_epipe_state_cb(struct ustream *s)
                rpc_file_exec_reply(c, UBUS_STATUS_OK);
 }
 
+static void
+rpc_fdclose(int fd)
+{
+       if (fd > 2)
+               close(fd);
+}
+
 static int
-rpc_file_exec_run(const char *cmd,
-                             const struct blob_attr *arg, const struct blob_attr *env,
+rpc_file_exec_run(const char *cmd, const struct blob_attr *sid,
+                  const struct blob_attr *arg, const struct blob_attr *env,
                   struct ubus_context *ctx, struct ubus_request_data *req)
 {
        pid_t pid;
 
+       int devnull;
        int opipe[2];
        int epipe[2];
 
        int rem;
        struct blob_attr *cur;
 
-       char arglen;
-       char **args;
+       uint8_t arglen;
+       char *executable, **args, **tmp;
 
        struct rpc_file_exec_context *c;
 
@@ -440,6 +810,14 @@ rpc_file_exec_run(const char *cmd,
        if (!cmd)
                return UBUS_STATUS_NOT_FOUND;
 
+       executable = rpc_canonicalize_path(cmd);
+
+       if (executable == NULL)
+               return UBUS_STATUS_UNKNOWN_ERROR;
+
+       if (!rpc_file_access(sid, executable, "exec"))
+               return UBUS_STATUS_PERMISSION_DENIED;
+
        c = malloc(sizeof(*c));
 
        if (!c)
@@ -456,14 +834,20 @@ rpc_file_exec_run(const char *cmd,
        case 0:
                uloop_done();
 
+               devnull = open("/dev/null", O_RDWR);
+
+               if (devnull == -1)
+                       return UBUS_STATUS_UNKNOWN_ERROR;
+
+               dup2(devnull, 0);
                dup2(opipe[1], 1);
                dup2(epipe[1], 2);
 
-               close(0);
-               close(opipe[0]);
-               close(opipe[1]);
-               close(epipe[0]);
-               close(epipe[1]);
+               rpc_fdclose(devnull);
+               rpc_fdclose(opipe[0]);
+               rpc_fdclose(opipe[1]);
+               rpc_fdclose(epipe[0]);
+               rpc_fdclose(epipe[1]);
 
                arglen = 2;
                args = malloc(sizeof(char *) * arglen);
@@ -471,7 +855,7 @@ rpc_file_exec_run(const char *cmd,
                if (!args)
                        return UBUS_STATUS_UNKNOWN_ERROR;
 
-               args[0] = (char *)cmd;
+               args[0] = (char *)executable;
                args[1] = NULL;
 
                if (arg)
@@ -481,11 +865,22 @@ rpc_file_exec_run(const char *cmd,
                                if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
                                        continue;
 
+                               if (arglen == 255)
+                               {
+                                       free(args);
+                                       return UBUS_STATUS_INVALID_ARGUMENT;
+                               }
+
                                arglen++;
+                               tmp = realloc(args, sizeof(char *) * arglen);
 
-                               if (!(args = realloc(args, sizeof(char *) * arglen)))
+                               if (!tmp)
+                               {
+                                       free(args);
                                        return UBUS_STATUS_UNKNOWN_ERROR;
+                               }
 
+                               args = tmp;
                                args[arglen-2] = blobmsg_data(cur);
                                args[arglen-1] = NULL;
                        }
@@ -502,7 +897,7 @@ rpc_file_exec_run(const char *cmd,
                        }
                }
 
-               if (execv(cmd, args))
+               if (execv(executable, args))
                        return rpc_errno_status();
 
        default:
@@ -516,7 +911,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, *ops->exec_timeout);
 
                close(opipe[1]);
                close(epipe[1]);
@@ -541,19 +936,22 @@ rpc_file_exec(struct ubus_context *ctx, struct ubus_object *obj,
        if (!tb[RPC_E_CMD])
                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);
+       return rpc_file_exec_run(blobmsg_data(tb[RPC_E_CMD]), tb[RPC_E_SESSION],
+                                tb[RPC_E_PARM], tb[RPC_E_ENV], ctx, req);
 }
 
 
-int rpc_file_api_init(struct ubus_context *ctx)
+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("exec",    rpc_file_exec,  rpc_exec_policy),
+               UBUS_METHOD("read",    rpc_file_read,   rpc_file_RB_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("md5",     rpc_file_md5,    rpc_file_R_policy),
+               UBUS_METHOD("remove",  rpc_file_remove, rpc_file_R_policy),
+               UBUS_METHOD("exec",    rpc_file_exec,   rpc_exec_policy),
        };
 
        static struct ubus_object_type file_type =
@@ -566,5 +964,11 @@ int rpc_file_api_init(struct ubus_context *ctx)
                .n_methods = ARRAY_SIZE(file_methods),
        };
 
+       ops = o;
+
        return ubus_add_object(ctx, &obj);
 }
+
+struct rpc_plugin rpc_plugin = {
+       .init = rpc_file_api_init
+};