uci: fix memory leak in rpc_uci_replace_savedir()

[project/rpcd.git] / sys.c

diff --git a/sys.c b/sys.c
index 3691dfb..43eadc4 100644 (file)
--- a/sys.c
+++ b/sys.c
@@ -45,6 +45,15 @@ static const struct blobmsg_policy rpc_upgrade_policy[__RPC_UPGRADE_MAX] = {
        [RPC_UPGRADE_KEEP] = { .name = "keep",    .type = BLOBMSG_TYPE_BOOL },
 };
 
+enum {
+       RPC_PACKAGELIST_ALL,
+       __RPC_PACKAGELIST_MAX
+};
+
+static const struct blobmsg_policy rpc_packagelist_policy[__RPC_PACKAGELIST_MAX] = {
+       [RPC_PACKAGELIST_ALL] = { .name = "all",    .type = BLOBMSG_TYPE_BOOL },
+};
+
 static int
 rpc_errno_status(void)
 {
@@ -78,6 +87,7 @@ rpc_cgi_password_set(struct ubus_context *ctx, struct ubus_object *obj,
        struct blob_attr *tb[__RPC_P_MAX];
        ssize_t n;
        int ret;
+       const char *const passwd = "/bin/passwd";
 
        blobmsg_parse(rpc_password_policy, __RPC_P_MAX, tb,
                      blob_data(msg), blob_len(msg));
@@ -85,7 +95,7 @@ rpc_cgi_password_set(struct ubus_context *ctx, struct ubus_object *obj,
        if (!tb[RPC_P_USER] || !tb[RPC_P_PASSWORD])
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-       if (stat("/usr/bin/passwd", &s))
+       if (stat(passwd, &s))
                return UBUS_STATUS_NOT_FOUND;
 
        if (!(s.st_mode & S_IXUSR))
@@ -119,7 +129,7 @@ rpc_cgi_password_set(struct ubus_context *ctx, struct ubus_object *obj,
                if (ret < 0)
                        return rpc_errno_status();
 
-               if (execl("/usr/bin/passwd", "/usr/bin/passwd",
+               if (execl(passwd, passwd,
                          blobmsg_data(tb[RPC_P_USER]), NULL))
                        return rpc_errno_status();
 
@@ -154,6 +164,93 @@ rpc_cgi_password_set(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 static int
+rpc_sys_packagelist(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_PACKAGELIST_MAX];
+       int all = false;
+       struct blob_buf buf = { 0 };
+       char var[256], pkg[128], ver[128];
+       char *tmp, *p1, *p2, *p3;
+       void *tbl;
+
+       blobmsg_parse(rpc_packagelist_policy, __RPC_PACKAGELIST_MAX, tb,
+                     blob_data(msg), blob_len(msg));
+
+       if (tb[RPC_PACKAGELIST_ALL] && blobmsg_get_bool(tb[RPC_PACKAGELIST_ALL]))
+               all = true;
+
+       FILE *f = fopen("/usr/lib/opkg/status", "r");
+       if (!f)
+               return UBUS_STATUS_NOT_FOUND;
+
+       blob_buf_init(&buf, 0);
+       tbl = blobmsg_open_table(&buf, "packages");
+       pkg[0] = ver[0] = '\0';
+
+       while(fgets(var, sizeof(var), f)) {
+               p1 = strchr(var, ' ');
+               p2 = p3 = NULL;
+               if (!p1)
+                       goto procstr;
+
+               *p1++ = '\0';
+               p2 = strchr(p1, ' ');
+               if (!p2) {
+                       tmp = strchr(p1, '\n');
+                       if (tmp)
+                               *tmp = '\0';
+                       goto procstr;
+               }
+
+               *p2++ = '\0';
+               p3 = strchr(p2, ' ');
+               if (!p3) {
+                       tmp = strchr(p2, '\n');
+                       if (tmp)
+                               *tmp = '\0';
+                       goto procstr;
+               }
+
+               *p3++ = '\0';
+               tmp = strchr(p3, '\n');
+               if (tmp)
+                       *tmp = '\0';
+
+procstr:
+               if (!p1)
+                       continue;
+
+               if (!strcmp(var, "Package:")) {
+                       strncpy(pkg, p1, sizeof(pkg));
+                       continue;
+               }
+
+               if (!strcmp(var, "Version:")) {
+                       strncpy(ver, p1, sizeof(ver));
+                       continue;
+               }
+
+               if (p2 && p3 &&
+                   !strcmp(var, "Status:") &&
+                   !strcmp(p1, "install") &&
+                   (all || strstr(p2, "user")) &&
+                   !strcmp(p3, "installed") && pkg[0] && ver[0]) {
+                       blobmsg_add_string(&buf, pkg, ver);
+                       pkg[0] = ver[0] = '\0';
+               }
+       }
+
+       blobmsg_close_table(&buf, tbl);
+       ubus_send_reply(ctx, req, buf.head);
+       blob_buf_free(&buf);
+       fclose(f);
+
+       return 0;
+}
+
+static int
 rpc_sys_upgrade_test(struct ubus_context *ctx, struct ubus_object *obj,
                        struct ubus_request_data *req, const char *method,
                        struct blob_attr *msg)
@@ -234,6 +331,7 @@ static int
 rpc_sys_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx)
 {
        static const struct ubus_method sys_methods[] = {
+               UBUS_METHOD("packagelist", rpc_sys_packagelist, rpc_packagelist_policy),
                UBUS_METHOD("password_set", rpc_cgi_password_set, rpc_password_policy),
                UBUS_METHOD_NOARG("upgrade_test", rpc_sys_upgrade_test),
                UBUS_METHOD("upgrade_start",      rpc_sys_upgrade_start,