Remove code that has become unnecessary after sysupgrade changes
[project/procd.git] / service / instance.c
index ab517d7..e5c4830 100644 (file)
  * GNU General Public License for more details.
  */
 
+#define _GNU_SOURCE
 #include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
 #include <net/if.h>
 #include <unistd.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <fcntl.h>
+#include <pwd.h>
+#include <libgen.h>
+#include <unistd.h>
+
+#include <libubox/md5.h>
 
 #include "../procd.h"
 
 #include "service.h"
 #include "instance.h"
 
-#include "../utils/md5.h"
 
 enum {
        INSTANCE_ATTR_COMMAND,
@@ -36,6 +43,19 @@ enum {
        INSTANCE_ATTR_TRIGGER,
        INSTANCE_ATTR_RESPAWN,
        INSTANCE_ATTR_NICE,
+       INSTANCE_ATTR_LIMITS,
+       INSTANCE_ATTR_WATCH,
+       INSTANCE_ATTR_ERROR,
+       INSTANCE_ATTR_USER,
+       INSTANCE_ATTR_STDOUT,
+       INSTANCE_ATTR_STDERR,
+       INSTANCE_ATTR_NO_NEW_PRIVS,
+       INSTANCE_ATTR_JAIL,
+       INSTANCE_ATTR_TRACE,
+       INSTANCE_ATTR_SECCOMP,
+       INSTANCE_ATTR_PIDFILE,
+       INSTANCE_ATTR_RELOADSIG,
+       INSTANCE_ATTR_TERMTIMEOUT,
        __INSTANCE_ATTR_MAX
 };
 
@@ -48,6 +68,42 @@ static const struct blobmsg_policy instance_attr[__INSTANCE_ATTR_MAX] = {
        [INSTANCE_ATTR_TRIGGER] = { "triggers", BLOBMSG_TYPE_ARRAY },
        [INSTANCE_ATTR_RESPAWN] = { "respawn", BLOBMSG_TYPE_ARRAY },
        [INSTANCE_ATTR_NICE] = { "nice", BLOBMSG_TYPE_INT32 },
+       [INSTANCE_ATTR_LIMITS] = { "limits", BLOBMSG_TYPE_TABLE },
+       [INSTANCE_ATTR_WATCH] = { "watch", BLOBMSG_TYPE_ARRAY },
+       [INSTANCE_ATTR_ERROR] = { "error", BLOBMSG_TYPE_ARRAY },
+       [INSTANCE_ATTR_USER] = { "user", BLOBMSG_TYPE_STRING },
+       [INSTANCE_ATTR_STDOUT] = { "stdout", BLOBMSG_TYPE_BOOL },
+       [INSTANCE_ATTR_STDERR] = { "stderr", BLOBMSG_TYPE_BOOL },
+       [INSTANCE_ATTR_NO_NEW_PRIVS] = { "no_new_privs", BLOBMSG_TYPE_BOOL },
+       [INSTANCE_ATTR_JAIL] = { "jail", BLOBMSG_TYPE_TABLE },
+       [INSTANCE_ATTR_TRACE] = { "trace", BLOBMSG_TYPE_BOOL },
+       [INSTANCE_ATTR_SECCOMP] = { "seccomp", BLOBMSG_TYPE_STRING },
+       [INSTANCE_ATTR_PIDFILE] = { "pidfile", BLOBMSG_TYPE_STRING },
+       [INSTANCE_ATTR_RELOADSIG] = { "reload_signal", BLOBMSG_TYPE_INT32 },
+       [INSTANCE_ATTR_TERMTIMEOUT] = { "term_timeout", BLOBMSG_TYPE_INT32 },
+};
+
+enum {
+       JAIL_ATTR_NAME,
+       JAIL_ATTR_HOSTNAME,
+       JAIL_ATTR_PROCFS,
+       JAIL_ATTR_SYSFS,
+       JAIL_ATTR_UBUS,
+       JAIL_ATTR_LOG,
+       JAIL_ATTR_RONLY,
+       JAIL_ATTR_MOUNT,
+       __JAIL_ATTR_MAX,
+};
+
+static const struct blobmsg_policy jail_attr[__JAIL_ATTR_MAX] = {
+       [JAIL_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
+       [JAIL_ATTR_HOSTNAME] = { "hostname", BLOBMSG_TYPE_STRING },
+       [JAIL_ATTR_PROCFS] = { "procfs", BLOBMSG_TYPE_BOOL },
+       [JAIL_ATTR_SYSFS] = { "sysfs", BLOBMSG_TYPE_BOOL },
+       [JAIL_ATTR_UBUS] = { "ubus", BLOBMSG_TYPE_BOOL },
+       [JAIL_ATTR_LOG] = { "log", BLOBMSG_TYPE_BOOL },
+       [JAIL_ATTR_RONLY] = { "ronly", BLOBMSG_TYPE_BOOL },
+       [JAIL_ATTR_MOUNT] = { "mount", BLOBMSG_TYPE_TABLE },
 };
 
 struct instance_netdev {
@@ -60,14 +116,180 @@ struct instance_file {
        uint32_t md5[4];
 };
 
+struct rlimit_name {
+       const char *name;
+       int resource;
+};
+
+static const struct rlimit_name rlimit_names[] = {
+       { "as", RLIMIT_AS },
+       { "core", RLIMIT_CORE },
+       { "cpu", RLIMIT_CPU },
+       { "data", RLIMIT_DATA },
+       { "fsize", RLIMIT_FSIZE },
+       { "memlock", RLIMIT_MEMLOCK },
+       { "nofile", RLIMIT_NOFILE },
+       { "nproc", RLIMIT_NPROC },
+       { "rss", RLIMIT_RSS },
+       { "stack", RLIMIT_STACK },
+#ifdef linux
+       { "nice", RLIMIT_NICE },
+       { "rtprio", RLIMIT_RTPRIO },
+       { "msgqueue", RLIMIT_MSGQUEUE },
+       { "sigpending", RLIMIT_SIGPENDING },
+#endif
+       { NULL, 0 }
+};
+
+static char trace[] = "/sbin/utrace";
+
+static void closefd(int fd)
+{
+       if (fd > STDERR_FILENO)
+               close(fd);
+}
+
+static void
+instance_limits(const char *limit, const char *value)
+{
+       int i;
+       struct rlimit rlim;
+       unsigned long cur, max;
+
+       for (i = 0; rlimit_names[i].name != NULL; i++) {
+               if (strcmp(rlimit_names[i].name, limit))
+                       continue;
+               if (!strcmp(value, "unlimited")) {
+                       rlim.rlim_cur = RLIM_INFINITY;
+                       rlim.rlim_max = RLIM_INFINITY;
+               } else {
+                       if (getrlimit(rlimit_names[i].resource, &rlim))
+                               return;
+
+                       cur = rlim.rlim_cur;
+                       max = rlim.rlim_max;
+
+                       if (sscanf(value, "%lu %lu", &cur, &max) < 1)
+                               return;
+
+                       rlim.rlim_cur = cur;
+                       rlim.rlim_max = max;
+               }
+
+               setrlimit(rlimit_names[i].resource, &rlim);
+               return;
+       }
+}
+
+static inline int
+jail_run(struct service_instance *in, char **argv)
+{
+       struct blobmsg_list_node *var;
+       struct jail *jail = &in->jail;
+       int argc = 0;
+
+       argv[argc++] = "/sbin/ujail";
+
+       if (jail->name) {
+               argv[argc++] = "-n";
+               argv[argc++] = jail->name;
+       }
+
+       if (jail->hostname) {
+               argv[argc++] = "-h";
+               argv[argc++] = jail->hostname;
+       }
+
+       if (in->seccomp) {
+               argv[argc++] = "-S";
+               argv[argc++] = in->seccomp;
+       }
+
+       if (in->no_new_privs)
+               argv[argc++] = "-c";
+
+       if (jail->procfs)
+               argv[argc++] = "-p";
+
+       if (jail->sysfs)
+               argv[argc++] = "-s";
+
+       if (jail->ubus)
+               argv[argc++] = "-u";
+
+       if (jail->log)
+               argv[argc++] = "-l";
+
+       if (jail->ronly)
+               argv[argc++] = "-o";
+
+       blobmsg_list_for_each(&jail->mount, var) {
+               const char *type = blobmsg_data(var->data);
+
+               if (*type == '1')
+                       argv[argc++] = "-w";
+               else
+                       argv[argc++] = "-r";
+               argv[argc++] = (char *) blobmsg_name(var->data);
+       }
+
+       argv[argc++] = "--";
+
+       return argc;
+}
+
+static int
+instance_removepid(struct service_instance *in) {
+       if (!in->pidfile)
+               return 0;
+       if (unlink(in->pidfile)) {
+               ERROR("Failed to removed pidfile: %s: %d - %s\n",
+                       in->pidfile, errno, strerror(errno));
+               return 1;
+       }
+       return 0;
+}
+
+static int
+instance_writepid(struct service_instance *in)
+{
+       FILE *_pidfile;
+
+       if (!in->pidfile) {
+               return 0;
+       }
+       _pidfile = fopen(in->pidfile, "w");
+       if (_pidfile == NULL) {
+               ERROR("failed to open pidfile for writing: %s: %d (%s)",
+                       in->pidfile, errno, strerror(errno));
+               return 1;
+       }
+       if (fprintf(_pidfile, "%d\n", in->proc.pid) < 0) {
+               ERROR("failed to write pidfile: %s: %d (%s)",
+                       in->pidfile, errno, strerror(errno));
+               fclose(_pidfile);
+               return 2;
+       }
+       if (fclose(_pidfile)) {
+               ERROR("failed to close pidfile: %s: %d (%s)",
+                       in->pidfile, errno, strerror(errno));
+               return 3;
+       }
+
+       return 0;
+}
+
 static void
-instance_run(struct service_instance *in)
+instance_run(struct service_instance *in, int _stdout, int _stderr)
 {
        struct blobmsg_list_node *var;
        struct blob_attr *cur;
        char **argv;
+       char *ld_preload;
        int argc = 1; /* NULL terminated */
-       int rem, fd;
+       int rem, _stdin;
+       bool seccomp = !in->trace && !in->has_jail && in->seccomp;
+       bool setlbf = _stdout >= 0;
 
        if (in->nice)
                setpriority(PRIO_PROCESS, 0, in->nice);
@@ -78,35 +300,125 @@ instance_run(struct service_instance *in)
        blobmsg_list_for_each(&in->env, var)
                setenv(blobmsg_name(var->data), blobmsg_data(var->data), 1);
 
-       argv = alloca(sizeof(char *) * argc);
+       if (seccomp)
+               setenv("SECCOMP_FILE", in->seccomp, 1);
+
+       if ((seccomp || setlbf) && asprintf(&ld_preload, "LD_PRELOAD=%s%s%s",
+                       seccomp ? "/lib/libpreload-seccomp.so" : "",
+                       seccomp && setlbf ? ":" : "",
+                       setlbf ? "/lib/libsetlbf.so" : "") > 0)
+               putenv(ld_preload);
+
+       blobmsg_list_for_each(&in->limits, var)
+               instance_limits(blobmsg_name(var->data), blobmsg_data(var->data));
+
+       if (in->trace)
+               argc += 1;
+
+       argv = alloca(sizeof(char *) * (argc + in->jail.argc));
        argc = 0;
 
+       if (in->trace)
+               argv[argc++] = trace;
+
+       if (in->has_jail)
+               argc = jail_run(in, argv);
+
        blobmsg_for_each_attr(cur, in->command, rem)
                argv[argc++] = blobmsg_data(cur);
 
        argv[argc] = NULL;
-       fd = open("/dev/null", O_RDWR);
-       if (fd > -1) {
-               dup2(fd, STDIN_FILENO);
-               dup2(fd, STDOUT_FILENO);
-               dup2(fd, STDERR_FILENO);
-               if (fd > STDERR_FILENO)
-                       close(fd);
+
+       _stdin = open("/dev/null", O_RDONLY);
+
+       if (_stdout == -1)
+               _stdout = open("/dev/null", O_WRONLY);
+
+       if (_stderr == -1)
+               _stderr = open("/dev/null", O_WRONLY);
+
+       if (_stdin > -1) {
+               dup2(_stdin, STDIN_FILENO);
+               closefd(_stdin);
+       }
+       if (_stdout > -1) {
+               dup2(_stdout, STDOUT_FILENO);
+               closefd(_stdout);
+       }
+       if (_stderr > -1) {
+               dup2(_stderr, STDERR_FILENO);
+               closefd(_stderr);
        }
+
+       if (in->gid && setgid(in->gid)) {
+               ERROR("failed to set group id %d: %d (%s)\n", in->gid, errno, strerror(errno));
+               exit(127);
+       }
+       if (in->uid && setuid(in->uid)) {
+               ERROR("failed to set user id %d: %d (%s)\n", in->uid, errno, strerror(errno));
+               exit(127);
+       }
+
        execvp(argv[0], argv);
        exit(127);
 }
 
+static void
+instance_free_stdio(struct service_instance *in)
+{
+       if (in->_stdout.fd.fd > -1) {
+               ustream_free(&in->_stdout.stream);
+               close(in->_stdout.fd.fd);
+               in->_stdout.fd.fd = -1;
+       }
+
+       if (in->_stderr.fd.fd > -1) {
+               ustream_free(&in->_stderr.stream);
+               close(in->_stderr.fd.fd);
+               in->_stderr.fd.fd = -1;
+       }
+}
+
 void
 instance_start(struct service_instance *in)
 {
        int pid;
+       int opipe[2] = { -1, -1 };
+       int epipe[2] = { -1, -1 };
 
-       if (in->proc.pending)
+       if (!avl_is_empty(&in->errors.avl)) {
+               LOG("Not starting instance %s::%s, an error was indicated\n", in->srv->name, in->name);
+               return;
+       }
+
+       if (!in->command) {
+               LOG("Not starting instance %s::%s, command not set\n", in->srv->name, in->name);
+               return;
+       }
+
+       if (in->proc.pending) {
+               if (in->halt)
+                       in->restart = true;
                return;
+       }
+
+       instance_free_stdio(in);
+       if (in->_stdout.fd.fd > -2) {
+               if (pipe(opipe)) {
+                       ULOG_WARN("pipe() failed: %d (%s)\n", errno, strerror(errno));
+                       opipe[0] = opipe[1] = -1;
+               }
+       }
+
+       if (in->_stderr.fd.fd > -2) {
+               if (pipe(epipe)) {
+                       ULOG_WARN("pipe() failed: %d (%s)\n", errno, strerror(errno));
+                       epipe[0] = epipe[1] = -1;
+               }
+       }
 
        in->restart = false;
-       in->halt = !in->respawn;
+       in->halt = false;
 
        if (!in->valid)
                return;
@@ -117,14 +429,72 @@ instance_start(struct service_instance *in)
 
        if (!pid) {
                uloop_done();
-               instance_run(in);
+               closefd(opipe[0]);
+               closefd(epipe[0]);
+               instance_run(in, opipe[1], epipe[1]);
                return;
        }
 
-       DEBUG(2, "Started instance %s::%s\n", in->srv->name, in->name);
+       DEBUG(2, "Started instance %s::%s[%d]\n", in->srv->name, in->name, pid);
        in->proc.pid = pid;
+       instance_writepid(in);
        clock_gettime(CLOCK_MONOTONIC, &in->start);
        uloop_process_add(&in->proc);
+
+       if (opipe[0] > -1) {
+               ustream_fd_init(&in->_stdout, opipe[0]);
+               closefd(opipe[1]);
+       }
+
+       if (epipe[0] > -1) {
+               ustream_fd_init(&in->_stderr, epipe[0]);
+               closefd(epipe[1]);
+       }
+
+       service_event("instance.start", in->srv->name, in->name);
+}
+
+static void
+instance_stdio(struct ustream *s, int prio, struct service_instance *in)
+{
+       char *newline, *str, *arg0, ident[32];
+       int len;
+
+       arg0 = basename(blobmsg_data(blobmsg_data(in->command)));
+       snprintf(ident, sizeof(ident), "%s[%d]", arg0, in->proc.pid);
+       ulog_open(ULOG_SYSLOG, LOG_DAEMON, ident);
+
+       do {
+               str = ustream_get_read_buf(s, NULL);
+               if (!str)
+                       break;
+
+               newline = strchr(str, '\n');
+               if (!newline)
+                       break;
+
+               *newline = 0;
+               ulog(prio, "%s\n", str);
+
+               len = newline + 1 - str;
+               ustream_consume(s, len);
+       } while (1);
+
+       ulog_open(ULOG_SYSLOG, LOG_DAEMON, "procd");
+}
+
+static void
+instance_stdout(struct ustream *s, int bytes)
+{
+       instance_stdio(s, LOG_INFO,
+                      container_of(s, struct service_instance, _stdout.stream));
+}
+
+static void
+instance_stderr(struct ustream *s, int bytes)
+{
+       instance_stdio(s, LOG_ERR,
+                      container_of(s, struct service_instance, _stderr.stream));
 }
 
 static void
@@ -134,7 +504,11 @@ instance_timeout(struct uloop_timeout *t)
 
        in = container_of(t, struct service_instance, timeout);
 
-       if (!in->halt && (in->restart || in->respawn))
+       if (in->halt) {
+               LOG("Instance %s::%s pid %d not stopped on SIGTERM, sending SIGKILL instead\n",
+                               in->srv->name, in->name, in->proc.pid);
+               kill(in->proc.pid, SIGKILL);
+       } else if (in->restart || in->respawn)
                instance_start(in);
 }
 
@@ -151,12 +525,21 @@ instance_exit(struct uloop_process *p, int ret)
        runtime = tp.tv_sec - in->start.tv_sec;
 
        DEBUG(2, "Instance %s::%s exit with error code %d after %ld seconds\n", in->srv->name, in->name, ret, runtime);
-       if (upgrade_running)
-               return;
 
        uloop_timeout_cancel(&in->timeout);
+       service_event("instance.stop", in->srv->name, in->name);
+
        if (in->halt) {
-               /* no action */
+               instance_removepid(in);
+               if (in->restart)
+                       instance_start(in);
+               else {
+                       struct service *s = in->srv;
+
+                       avl_delete(&s->instances.avl, &in->node.avl);
+                       instance_free(in);
+                       service_stopped(s);
+               }
        } else if (in->restart) {
                instance_start(in);
        } else if (in->respawn) {
@@ -169,20 +552,23 @@ instance_exit(struct uloop_process *p, int ret)
                                                                in->srv->name, in->name, in->respawn_count, runtime);
                        in->restart = in->respawn = 0;
                        in->halt = 1;
+                       service_event("instance.fail", in->srv->name, in->name);
                } else {
+                       service_event("instance.respawn", in->srv->name, in->name);
                        uloop_timeout_set(&in->timeout, in->respawn_timeout * 1000);
                }
        }
 }
 
 void
-instance_stop(struct service_instance *in)
+instance_stop(struct service_instance *in, bool halt)
 {
        if (!in->proc.pending)
                return;
-       in->halt = true;
+       in->halt = halt;
        in->restart = in->respawn = false;
        kill(in->proc.pid, SIGTERM);
+       uloop_timeout_set(&in->timeout, in->term_timeout * 1000);
 }
 
 static void
@@ -190,9 +576,16 @@ instance_restart(struct service_instance *in)
 {
        if (!in->proc.pending)
                return;
-       in->halt = false;
+
+       if (in->reload_signal) {
+               kill(in->proc.pid, in->reload_signal);
+               return;
+       }
+
+       in->halt = true;
        in->restart = true;
        kill(in->proc.pid, SIGTERM);
+       uloop_timeout_set(&in->timeout, in->term_timeout * 1000);
 }
 
 static bool
@@ -207,9 +600,6 @@ instance_config_changed(struct service_instance *in, struct service_instance *in
        if (!blobmsg_list_equal(&in->env, &in_new->env))
                return true;
 
-       if (!blobmsg_list_equal(&in->data, &in_new->data))
-               return true;
-
        if (!blobmsg_list_equal(&in->netdev, &in_new->netdev))
                return true;
 
@@ -219,6 +609,31 @@ instance_config_changed(struct service_instance *in, struct service_instance *in
        if (in->nice != in_new->nice)
                return true;
 
+       if (in->uid != in_new->uid)
+               return true;
+
+       if (in->gid != in_new->gid)
+               return true;
+
+       if (in->pidfile && in_new->pidfile)
+               if (strcmp(in->pidfile, in_new->pidfile))
+                       return true;
+
+       if (in->pidfile && !in_new->pidfile)
+               return true;
+
+       if (!in->pidfile && in_new->pidfile)
+               return true;
+
+       if (!blobmsg_list_equal(&in->limits, &in_new->limits))
+               return true;
+
+       if (!blobmsg_list_equal(&in->jail.mount, &in_new->jail.mount))
+               return true;
+
+       if (!blobmsg_list_equal(&in->errors, &in_new->errors))
+               return true;
+
        return false;
 }
 
@@ -281,6 +696,15 @@ instance_file_update(struct blobmsg_list_node *l)
        close(fd);
 }
 
+static void
+instance_fill_any(struct blobmsg_list *l, struct blob_attr *cur)
+{
+       if (!cur)
+               return;
+
+       blobmsg_list_fill(l, blobmsg_data(cur), blobmsg_data_len(cur), false);
+}
+
 static bool
 instance_fill_array(struct blobmsg_list *l, struct blob_attr *cur, blobmsg_update_cb cb, bool array)
 {
@@ -300,33 +724,103 @@ instance_fill_array(struct blobmsg_list *l, struct blob_attr *cur, blobmsg_updat
        return true;
 }
 
+static int
+instance_jail_parse(struct service_instance *in, struct blob_attr *attr)
+{
+       struct blob_attr *tb[__JAIL_ATTR_MAX];
+       struct jail *jail = &in->jail;
+       struct stat s;
+
+       if (stat("/sbin/ujail", &s))
+               return 0;
+
+       blobmsg_parse(jail_attr, __JAIL_ATTR_MAX, tb,
+               blobmsg_data(attr), blobmsg_data_len(attr));
+
+       jail->argc = 2;
+
+       if (tb[JAIL_ATTR_NAME]) {
+               jail->name = blobmsg_get_string(tb[JAIL_ATTR_NAME]);
+               jail->argc += 2;
+       }
+       if (tb[JAIL_ATTR_HOSTNAME]) {
+               jail->hostname = blobmsg_get_string(tb[JAIL_ATTR_HOSTNAME]);
+               jail->argc += 2;
+       }
+       if (tb[JAIL_ATTR_PROCFS]) {
+               jail->procfs = blobmsg_get_bool(tb[JAIL_ATTR_PROCFS]);
+               jail->argc++;
+       }
+       if (tb[JAIL_ATTR_SYSFS]) {
+               jail->sysfs = blobmsg_get_bool(tb[JAIL_ATTR_SYSFS]);
+               jail->argc++;
+       }
+       if (tb[JAIL_ATTR_UBUS]) {
+               jail->ubus = blobmsg_get_bool(tb[JAIL_ATTR_UBUS]);
+               jail->argc++;
+       }
+       if (tb[JAIL_ATTR_LOG]) {
+               jail->log = blobmsg_get_bool(tb[JAIL_ATTR_LOG]);
+               jail->argc++;
+       }
+       if (tb[JAIL_ATTR_RONLY]) {
+               jail->ronly = blobmsg_get_bool(tb[JAIL_ATTR_RONLY]);
+               jail->argc++;
+       }
+       if (tb[JAIL_ATTR_MOUNT]) {
+               struct blob_attr *cur;
+               int rem;
+
+               blobmsg_for_each_attr(cur, tb[JAIL_ATTR_MOUNT], rem)
+                       jail->argc += 2;
+               instance_fill_array(&jail->mount, tb[JAIL_ATTR_MOUNT], NULL, false);
+       }
+       if (in->seccomp)
+               jail->argc += 2;
+
+       return 1;
+}
+
 static bool
-instance_config_parse(struct service_instance *in)
+instance_config_parse_command(struct service_instance *in, struct blob_attr **tb)
 {
-       struct blob_attr *tb[__INSTANCE_ATTR_MAX];
        struct blob_attr *cur, *cur2;
-       int argc = 0;
+       bool ret = false;
        int rem;
 
-       blobmsg_parse(instance_attr, __INSTANCE_ATTR_MAX, tb,
-               blobmsg_data(in->config), blobmsg_data_len(in->config));
-
        cur = tb[INSTANCE_ATTR_COMMAND];
-       if (!cur)
-               return false;
+       if (!cur) {
+               in->command = NULL;
+               return true;
+       }
 
        if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING))
                return false;
 
        blobmsg_for_each_attr(cur2, cur, rem) {
-               argc++;
+               ret = true;
                break;
        }
-       if (!argc)
-               return false;
 
        in->command = cur;
+       return ret;
+}
 
+static bool
+instance_config_parse(struct service_instance *in)
+{
+       struct blob_attr *tb[__INSTANCE_ATTR_MAX];
+       struct blob_attr *cur, *cur2;
+       int rem;
+
+       blobmsg_parse(instance_attr, __INSTANCE_ATTR_MAX, tb,
+               blobmsg_data(in->config), blobmsg_data_len(in->config));
+
+       if (!instance_config_parse_command(in, tb))
+               return false;
+
+       if (tb[INSTANCE_ATTR_TERMTIMEOUT])
+               in->term_timeout = blobmsg_get_u32(tb[INSTANCE_ATTR_TERMTIMEOUT]);
        if (tb[INSTANCE_ATTR_RESPAWN]) {
                int i = 0;
                uint32_t vals[3] = { 3600, 5, 5};
@@ -344,23 +838,70 @@ instance_config_parse(struct service_instance *in)
                in->respawn_retry = vals[2];
        }
        if (tb[INSTANCE_ATTR_TRIGGER]) {
-               in->trigger = malloc(blob_pad_len(tb[INSTANCE_ATTR_TRIGGER]));
-               if (!in->trigger)
-                       return -1;
-               memcpy(in->trigger, tb[INSTANCE_ATTR_TRIGGER], blob_pad_len(tb[INSTANCE_ATTR_TRIGGER]));
+               in->trigger = tb[INSTANCE_ATTR_TRIGGER];
                trigger_add(in->trigger, in);
        }
 
+       if (tb[INSTANCE_ATTR_WATCH]) {
+               blobmsg_for_each_attr(cur2, tb[INSTANCE_ATTR_WATCH], rem) {
+                       if (blobmsg_type(cur2) != BLOBMSG_TYPE_STRING)
+                               continue;
+                       DEBUG(3, "watch for %s\n", blobmsg_get_string(cur2));
+                       watch_add(blobmsg_get_string(cur2), in);
+               }
+       }
+
        if ((cur = tb[INSTANCE_ATTR_NICE])) {
                in->nice = (int8_t) blobmsg_get_u32(cur);
                if (in->nice < -20 || in->nice > 20)
                        return false;
        }
 
-       if (!instance_fill_array(&in->env, tb[INSTANCE_ATTR_ENV], NULL, false))
-               return false;
+       if (tb[INSTANCE_ATTR_USER]) {
+               struct passwd *p = getpwnam(blobmsg_get_string(tb[INSTANCE_ATTR_USER]));
+               if (p) {
+                       in->uid = p->pw_uid;
+                       in->gid = p->pw_gid;
+               }
+       }
+
+       if (tb[INSTANCE_ATTR_TRACE])
+               in->trace = blobmsg_get_bool(tb[INSTANCE_ATTR_TRACE]);
+
+       if (tb[INSTANCE_ATTR_NO_NEW_PRIVS])
+               in->no_new_privs = blobmsg_get_bool(tb[INSTANCE_ATTR_NO_NEW_PRIVS]);
 
-       if (!instance_fill_array(&in->data, tb[INSTANCE_ATTR_DATA], NULL, false))
+       if (!in->trace && tb[INSTANCE_ATTR_SECCOMP]) {
+               char *seccomp = blobmsg_get_string(tb[INSTANCE_ATTR_SECCOMP]);
+               struct stat s;
+
+               if (stat(seccomp, &s))
+                       ERROR("%s: not starting seccomp as %s is missing\n", in->name, seccomp);
+               else
+                       in->seccomp = seccomp;
+       }
+
+       if (tb[INSTANCE_ATTR_PIDFILE]) {
+               char *pidfile = blobmsg_get_string(tb[INSTANCE_ATTR_PIDFILE]);
+               if (pidfile)
+                       in->pidfile = pidfile;
+       }
+
+       if (tb[INSTANCE_ATTR_RELOADSIG])
+               in->reload_signal = blobmsg_get_u32(tb[INSTANCE_ATTR_RELOADSIG]);
+
+       if (!in->trace && tb[INSTANCE_ATTR_JAIL])
+               in->has_jail = instance_jail_parse(in, tb[INSTANCE_ATTR_JAIL]);
+
+       if (tb[INSTANCE_ATTR_STDOUT] && blobmsg_get_bool(tb[INSTANCE_ATTR_STDOUT]))
+               in->_stdout.fd.fd = -1;
+
+       if (tb[INSTANCE_ATTR_STDERR] && blobmsg_get_bool(tb[INSTANCE_ATTR_STDERR]))
+               in->_stderr.fd.fd = -1;
+
+       instance_fill_any(&in->data, tb[INSTANCE_ATTR_DATA]);
+
+       if (!instance_fill_array(&in->env, tb[INSTANCE_ATTR_ENV], NULL, false))
                return false;
 
        if (!instance_fill_array(&in->netdev, tb[INSTANCE_ATTR_NETDEV], instance_netdev_update, true))
@@ -369,6 +910,12 @@ instance_config_parse(struct service_instance *in)
        if (!instance_fill_array(&in->file, tb[INSTANCE_ATTR_FILE], instance_file_update, true))
                return false;
 
+       if (!instance_fill_array(&in->limits, tb[INSTANCE_ATTR_LIMITS], NULL, false))
+               return false;
+
+       if (!instance_fill_array(&in->errors, tb[INSTANCE_ATTR_ERROR], NULL, true))
+               return false;
+
        return true;
 }
 
@@ -378,6 +925,10 @@ instance_config_cleanup(struct service_instance *in)
        blobmsg_list_free(&in->env);
        blobmsg_list_free(&in->data);
        blobmsg_list_free(&in->netdev);
+       blobmsg_list_free(&in->file);
+       blobmsg_list_free(&in->limits);
+       blobmsg_list_free(&in->errors);
+       blobmsg_list_free(&in->jail.mount);
 }
 
 static void
@@ -387,8 +938,13 @@ instance_config_move(struct service_instance *in, struct service_instance *in_sr
        blobmsg_list_move(&in->env, &in_src->env);
        blobmsg_list_move(&in->data, &in_src->data);
        blobmsg_list_move(&in->netdev, &in_src->netdev);
+       blobmsg_list_move(&in->file, &in_src->file);
+       blobmsg_list_move(&in->limits, &in_src->limits);
+       blobmsg_list_move(&in->errors, &in_src->errors);
+       blobmsg_list_move(&in->jail.mount, &in_src->jail.mount);
        in->trigger = in_src->trigger;
        in->command = in_src->command;
+       in->pidfile = in_src->pidfile;
        in->name = in_src->name;
        in->node.avl.key = in_src->node.avl.key;
 
@@ -397,34 +953,32 @@ instance_config_move(struct service_instance *in, struct service_instance *in_sr
        in_src->config = NULL;
 }
 
-bool
+void
 instance_update(struct service_instance *in, struct service_instance *in_new)
 {
        bool changed = instance_config_changed(in, in_new);
        bool running = in->proc.pending;
+       bool stopping = in->halt;
 
-       if (!changed && running)
-               return false;
-
-       if (!running) {
-               if (changed)
-                       instance_config_move(in, in_new);
+       if (!running || stopping) {
+               instance_config_move(in, in_new);
                instance_start(in);
        } else {
-               instance_restart(in);
+               if (changed)
+                       instance_restart(in);
                instance_config_move(in, in_new);
                /* restart happens in the child callback handler */
        }
-       return true;
 }
 
 void
 instance_free(struct service_instance *in)
 {
+       instance_free_stdio(in);
        uloop_process_delete(&in->proc);
        uloop_timeout_cancel(&in->timeout);
        trigger_del(in);
-       free(in->trigger);
+       watch_del(in);
        instance_config_cleanup(in);
        free(in->config);
        free(in);
@@ -439,11 +993,23 @@ instance_init(struct service_instance *in, struct service *s, struct blob_attr *
        in->config = config;
        in->timeout.cb = instance_timeout;
        in->proc.cb = instance_exit;
+       in->term_timeout = 5;
+
+       in->_stdout.fd.fd = -2;
+       in->_stdout.stream.string_data = true;
+       in->_stdout.stream.notify_read = instance_stdout;
+
+       in->_stderr.fd.fd = -2;
+       in->_stderr.stream.string_data = true;
+       in->_stderr.stream.notify_read = instance_stderr;
 
        blobmsg_list_init(&in->netdev, struct instance_netdev, node, instance_netdev_cmp);
        blobmsg_list_init(&in->file, struct instance_file, node, instance_file_cmp);
        blobmsg_list_simple_init(&in->env);
        blobmsg_list_simple_init(&in->data);
+       blobmsg_list_simple_init(&in->limits);
+       blobmsg_list_simple_init(&in->errors);
+       blobmsg_list_simple_init(&in->jail.mount);
        in->valid = instance_config_parse(in);
 }
 
@@ -451,11 +1017,24 @@ void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose)
 {
        void *i;
 
+       if (!in->valid)
+               return;
+
        i = blobmsg_open_table(b, in->name);
        blobmsg_add_u8(b, "running", in->proc.pending);
        if (in->proc.pending)
                blobmsg_add_u32(b, "pid", in->proc.pid);
-       blobmsg_add_blob(b, in->command);
+       if (in->command)
+               blobmsg_add_blob(b, in->command);
+       blobmsg_add_u32(b, "term_timeout", in->term_timeout);
+
+       if (!avl_is_empty(&in->errors.avl)) {
+               struct blobmsg_list_node *var;
+               void *e = blobmsg_open_array(b, "errors");
+               blobmsg_list_for_each(&in->errors, var)
+                       blobmsg_add_string(b, NULL, blobmsg_data(var->data));
+               blobmsg_close_table(b, e);
+       }
 
        if (!avl_is_empty(&in->env.avl)) {
                struct blobmsg_list_node *var;
@@ -465,14 +1044,66 @@ void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose)
                blobmsg_close_table(b, e);
        }
 
+       if (!avl_is_empty(&in->data.avl)) {
+               struct blobmsg_list_node *var;
+               void *e = blobmsg_open_table(b, "data");
+               blobmsg_list_for_each(&in->data, var)
+                       blobmsg_add_blob(b, var->data);
+               blobmsg_close_table(b, e);
+       }
+
+       if (!avl_is_empty(&in->limits.avl)) {
+               struct blobmsg_list_node *var;
+               void *e = blobmsg_open_table(b, "limits");
+               blobmsg_list_for_each(&in->limits, var)
+                       blobmsg_add_string(b, blobmsg_name(var->data), blobmsg_data(var->data));
+               blobmsg_close_table(b, e);
+       }
+
+       if (in->reload_signal)
+               blobmsg_add_u32(b, "reload_signal", in->reload_signal);
+
        if (in->respawn) {
                void *r = blobmsg_open_table(b, "respawn");
-               blobmsg_add_u32(b, "timeout", in->respawn_timeout);
                blobmsg_add_u32(b, "threshold", in->respawn_threshold);
+               blobmsg_add_u32(b, "timeout", in->respawn_timeout);
                blobmsg_add_u32(b, "retry", in->respawn_retry);
                blobmsg_close_table(b, r);
        }
 
+       if (in->trace)
+               blobmsg_add_u8(b, "trace", true);
+
+       if (in->no_new_privs)
+               blobmsg_add_u8(b, "no_new_privs", true);
+
+       if (in->seccomp)
+               blobmsg_add_string(b, "seccomp", in->seccomp);
+
+       if (in->pidfile)
+               blobmsg_add_string(b, "pidfile", in->pidfile);
+
+       if (in->has_jail) {
+               void *r = blobmsg_open_table(b, "jail");
+               if (in->jail.name)
+                       blobmsg_add_string(b, "name", in->jail.name);
+               if (in->jail.hostname)
+                       blobmsg_add_string(b, "hostname", in->jail.hostname);
+               blobmsg_add_u8(b, "procfs", in->jail.procfs);
+               blobmsg_add_u8(b, "sysfs", in->jail.sysfs);
+               blobmsg_add_u8(b, "ubus", in->jail.ubus);
+               blobmsg_add_u8(b, "log", in->jail.log);
+               blobmsg_add_u8(b, "ronly", in->jail.ronly);
+               blobmsg_close_table(b, r);
+               if (!avl_is_empty(&in->jail.mount.avl)) {
+                       struct blobmsg_list_node *var;
+                       void *e = blobmsg_open_table(b, "mount");
+                       blobmsg_list_for_each(&in->jail.mount, var)
+                               blobmsg_add_string(b, blobmsg_name(var->data), blobmsg_data(var->data));
+                       blobmsg_close_table(b, e);
+               }
+       }
+
        if (verbose && in->trigger)
                blobmsg_add_blob(b, in->trigger);