session: Fix crash when the UCI option 'password' or 'username' is missing
[project/rpcd.git] / sys.c
diff --git a/sys.c b/sys.c
index b90aa6b894aba29e8be4884c160a7c34ee0ca646..da3508ea989cfae34deb10d612c8707535281cd6 100644 (file)
--- a/sys.c
+++ b/sys.c
@@ -16,6 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <stdbool.h>
 #include <libubus.h>
 
 #include <rpcd/exec.h>
@@ -45,6 +46,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)
 {
@@ -76,6 +86,10 @@ rpc_cgi_password_set(struct ubus_context *ctx, struct ubus_object *obj,
        int fd, fds[2];
        struct stat s;
        struct blob_attr *tb[__RPC_P_MAX];
+       ssize_t n;
+       int ret;
+       const char *const passwd = "/bin/passwd";
+       const struct timespec ts = {0, 100 * 1000 * 1000};
 
        blobmsg_parse(rpc_password_policy, __RPC_P_MAX, tb,
                      blob_data(msg), blob_len(msg));
@@ -83,7 +97,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))
@@ -113,24 +127,35 @@ rpc_cgi_password_set(struct ubus_context *ctx, struct ubus_object *obj,
                        close(fd);
                }
 
-               chdir("/");
+               ret = chdir("/");
+               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();
 
        default:
                close(fds[0]);
 
-               write(fds[1], blobmsg_data(tb[RPC_P_PASSWORD]),
+               n = write(fds[1], blobmsg_data(tb[RPC_P_PASSWORD]),
                              blobmsg_data_len(tb[RPC_P_PASSWORD]) - 1);
-               write(fds[1], "\n", 1);
+               if (n < 0)
+                       return rpc_errno_status();
+
+               n = write(fds[1], "\n", 1);
+               if (n < 0)
+                       return rpc_errno_status();
 
-               usleep(100 * 1000);
+               nanosleep(&ts, NULL);
 
-               write(fds[1], blobmsg_data(tb[RPC_P_PASSWORD]),
+               n = write(fds[1], blobmsg_data(tb[RPC_P_PASSWORD]),
                              blobmsg_data_len(tb[RPC_P_PASSWORD]) - 1);
-               write(fds[1], "\n", 1);
+               if (n < 0)
+                       return rpc_errno_status();
+               n = write(fds[1], "\n", 1);
+               if (n < 0)
+                       return rpc_errno_status();
 
                close(fds[1]);
 
@@ -140,6 +165,96 @@ rpc_cgi_password_set(struct ubus_context *ctx, struct ubus_object *obj,
        }
 }
 
+static bool
+is_field(const char *type, const char *line)
+{
+       return strncmp(line, type, strlen(type)) == 0;
+}
+
+static bool
+is_blank(const char *line)
+{
+       for (; *line; line++)
+               if (!isspace(*line))
+                       return false;
+       return true;
+}
+
+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];
+       bool all = false, installed = false, auto_installed = false;
+       struct blob_buf buf = { 0 };
+       char line[256], tmp[128], pkg[128], ver[128];
+       char *pkg_abi;
+       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(line, sizeof(line), f)) {
+               switch (line[0]) {
+               case 'A':
+                       if (is_field("ABIVersion", line)) {
+                               /* if there is ABIVersion, remove that suffix */
+                               if (sscanf(line, "ABIVersion: %127s", tmp) == 1
+                                       && strlen(tmp) < strlen(pkg)) {
+                                       pkg_abi = pkg + (strlen(pkg) - strlen(tmp));
+                                       if (strncmp(pkg_abi, tmp, strlen(tmp)) == 0)
+                                               pkg_abi[0] = '\0';
+                               }
+                       } else if (is_field("Auto-Installed", line))
+                               if (sscanf(line, "Auto-Installed: %63s", tmp) == 1)
+                                       auto_installed = (strcmp(tmp, "yes") == 0);
+                       break;
+               case 'P':
+                       if (is_field("Package", line))
+                               if (sscanf(line, "Package: %127s", pkg) != 1)
+                                       pkg[0] = '\0';
+                       break;
+               case 'V':
+                       if (is_field("Version", line))
+                               if (sscanf(line, "Version: %127s", ver) != 1)
+                                       ver[0] = '\0';
+                       break;
+               case 'S':
+                       if (is_field("Status", line))
+                               if (sscanf(line, "Status: install %63s installed", tmp) == 1)
+                                       installed = true;
+                       break;
+               default:
+                       if (is_blank(line)) {
+                               if (installed && (all || !auto_installed) && pkg[0] && ver[0])
+                                       blobmsg_add_string(&buf, pkg, ver);
+                               pkg[0] = ver[0] = '\0';
+                               installed = auto_installed = false;
+                       }
+                       break;
+               }
+       }
+
+       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,
@@ -221,6 +336,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,
@@ -231,7 +347,7 @@ rpc_sys_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx)
        };
 
        static struct ubus_object_type sys_type =
-               UBUS_OBJECT_TYPE("luci-rpc-sys", sys_methods);
+               UBUS_OBJECT_TYPE("rpcd-plugin-sys", sys_methods);
 
        static struct ubus_object obj = {
                .name = "rpc-sys",