procd: instance: Support deleting stopped instances

[project/procd.git] / service / instance.c

diff --git a/service/instance.c b/service/instance.c
index b7cb523f402ea240cafd6dcc1aacc68c8647a374..3512f66b313c89f40fd293921327d0273ee2725d 100644 (file)
--- a/service/instance.c
+++ b/service/instance.c
@@ -17,6 +17,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
+#include <grp.h>
 #include <net/if.h>
 #include <unistd.h>
 #include <stdint.h>
@@ -141,8 +142,6 @@ static const struct rlimit_name rlimit_names[] = {
        { NULL, 0 }
 };
 
-static char trace[] = "/sbin/utrace";
-
 static void closefd(int fd)
 {
        if (fd > STDERR_FILENO)
@@ -243,8 +242,7 @@ 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));
+               ERROR("Failed to removed pidfile: %s: %m\n", in->pidfile);
                return 1;
        }
        return 0;
@@ -260,19 +258,16 @@ instance_writepid(struct service_instance *in)
        }
        _pidfile = fopen(in->pidfile, "w");
        if (_pidfile == NULL) {
-               ERROR("failed to open pidfile for writing: %s: %d (%s)",
-                       in->pidfile, errno, strerror(errno));
+               ERROR("failed to open pidfile for writing: %s: %m", in->pidfile);
                return 1;
        }
        if (fprintf(_pidfile, "%d\n", in->proc.pid) < 0) {
-               ERROR("failed to write pidfile: %s: %d (%s)",
-                       in->pidfile, errno, strerror(errno));
+               ERROR("failed to write pidfile: %s: %m", in->pidfile);
                fclose(_pidfile);
                return 2;
        }
        if (fclose(_pidfile)) {
-               ERROR("failed to close pidfile: %s: %d (%s)",
-                       in->pidfile, errno, strerror(errno));
+               ERROR("failed to close pidfile: %s: %m", in->pidfile);
                return 3;
        }
 
@@ -285,7 +280,6 @@ 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, _stdin;
        bool seccomp = !in->trace && !in->has_jail && in->seccomp;
@@ -303,8 +297,8 @@ instance_run(struct service_instance *in, int _stdout, int _stderr)
        if (seccomp)
                setenv("SECCOMP_FILE", in->seccomp, 1);
 
-       if (setlbf && asprintf(&ld_preload, "LD_PRELOAD=/lib/libsetlbf.so") > 0)
-               putenv(ld_preload);
+       if (setlbf)
+               setenv("LD_PRELOAD", "/lib/libsetlbf.so", 1);
 
        blobmsg_list_for_each(&in->limits, var)
                instance_limits(blobmsg_name(var->data), blobmsg_data(var->data));
@@ -315,10 +309,15 @@ instance_run(struct service_instance *in, int _stdout, int _stderr)
        argv = alloca(sizeof(char *) * (argc + in->jail.argc));
        argc = 0;
 
+#ifdef SECCOMP_SUPPORT
        if (in->trace)
-               argv[argc++] = trace;
+               argv[argc++] = "/sbin/utrace";
        else if (seccomp)
                argv[argc++] = "/sbin/seccomp-trace";
+#else
+       if (in->trace || seccomp)
+               ULOG_WARN("Seccomp support for %s::%s not available\n", in->srv->name, in->name);
+#endif
 
        if (in->has_jail)
                argc = jail_run(in, argv);
@@ -349,12 +348,16 @@ instance_run(struct service_instance *in, int _stdout, int _stderr)
                closefd(_stderr);
        }
 
+       if (in->user && in->gid && initgroups(in->user, in->gid)) {
+               ERROR("failed to initgroups() for user %s: %m\n", in->user);
+               exit(127);
+       }
        if (in->gid && setgid(in->gid)) {
-               ERROR("failed to set group id %d: %d (%s)\n", in->gid, errno, strerror(errno));
+               ERROR("failed to set group id %d: %m\n", in->gid);
                exit(127);
        }
        if (in->uid && setuid(in->uid)) {
-               ERROR("failed to set user id %d: %d (%s)\n", in->uid, errno, strerror(errno));
+               ERROR("failed to set user id %d: %m\n", in->uid);
                exit(127);
        }
 
@@ -404,14 +407,14 @@ instance_start(struct service_instance *in)
        instance_free_stdio(in);
        if (in->_stdout.fd.fd > -2) {
                if (pipe(opipe)) {
-                       ULOG_WARN("pipe() failed: %d (%s)\n", errno, strerror(errno));
+                       ULOG_WARN("pipe() failed: %m\n");
                        opipe[0] = opipe[1] = -1;
                }
        }
 
        if (in->_stderr.fd.fd > -2) {
                if (pipe(epipe)) {
-                       ULOG_WARN("pipe() failed: %d (%s)\n", errno, strerror(errno));
+                       ULOG_WARN("pipe() failed: %m\n");
                        epipe[0] = epipe[1] = -1;
                }
        }
@@ -466,18 +469,20 @@ instance_stdio(struct ustream *s, int prio, struct service_instance *in)
        ulog_open(ULOG_SYSLOG, LOG_DAEMON, ident);
 
        do {
-               str = ustream_get_read_buf(s, NULL);
+               str = ustream_get_read_buf(s, &len);
                if (!str)
                        break;
 
-               newline = strchr(str, '\n');
-               if (!newline)
+               newline = memchr(str, '\n', len);
+               if (!newline && (s->r.buffer_len != len))
                        break;
 
-               *newline = 0;
+               if (newline) {
+                       *newline = 0;
+                       len = newline + 1 - str;
+               }
                ulog(prio, "%s\n", str);
 
-               len = newline + 1 - str;
                ustream_consume(s, len);
        } while (1);
 
@@ -513,6 +518,16 @@ instance_timeout(struct uloop_timeout *t)
                instance_start(in);
 }
 
+static void
+instance_delete(struct service_instance *in)
+{
+       struct service *s = in->srv;
+
+       avl_delete(&s->instances.avl, &in->node.avl);
+       instance_free(in);
+       service_stopped(s);
+}
+
 static void
 instance_exit(struct uloop_process *p, int ret)
 {
@@ -534,13 +549,8 @@ instance_exit(struct uloop_process *p, int ret)
                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
+                       instance_delete(in);
        } else if (in->restart) {
                instance_start(in);
        } else if (in->respawn) {
@@ -564,8 +574,11 @@ instance_exit(struct uloop_process *p, int ret)
 void
 instance_stop(struct service_instance *in, bool halt)
 {
-       if (!in->proc.pending)
+       if (!in->proc.pending) {
+               if (halt)
+                       instance_delete(in);
                return;
+       }
        in->halt = halt;
        in->restart = in->respawn = false;
        kill(in->proc.pid, SIGTERM);
@@ -589,6 +602,11 @@ instance_restart(struct service_instance *in)
        uloop_timeout_set(&in->timeout, in->term_timeout * 1000);
 }
 
+static bool string_changed(const char *a, const char *b)
+{
+       return !((!a && !b) || (a && b && !strcmp(a, b)));
+}
+
 static bool
 instance_config_changed(struct service_instance *in, struct service_instance *in_new)
 {
@@ -610,20 +628,16 @@ 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)
+       if (string_changed(in->user, in_new->user))
                return true;
 
-       if (in->gid != in_new->gid)
+       if (in->uid != in_new->uid)
                return true;
 
-       if (in->pidfile && in_new->pidfile)
-               if (strcmp(in->pidfile, in_new->pidfile))
-                       return true;
-
-       if (in->pidfile && !in_new->pidfile)
+       if (in->gid != in_new->gid)
                return true;
 
-       if (!in->pidfile && in_new->pidfile)
+       if (string_changed(in->pidfile, in_new->pidfile))
                return true;
 
        if (in->respawn_retry != in_new->respawn_retry)
@@ -633,6 +647,11 @@ instance_config_changed(struct service_instance *in, struct service_instance *in
        if (in->respawn_timeout != in_new->respawn_timeout)
                return true;
 
+       if ((!in->seccomp && in_new->seccomp) ||
+           (in->seccomp && !in_new->seccomp) ||
+           (in->seccomp && in_new->seccomp && strcmp(in->seccomp, in_new->seccomp)))
+               return true;
+
        if (!blobmsg_list_equal(&in->limits, &in_new->limits))
                return true;
 
@@ -866,8 +885,10 @@ instance_config_parse(struct service_instance *in)
        }
 
        if (tb[INSTANCE_ATTR_USER]) {
-               struct passwd *p = getpwnam(blobmsg_get_string(tb[INSTANCE_ATTR_USER]));
+               const char *user = blobmsg_get_string(tb[INSTANCE_ATTR_USER]);
+               struct passwd *p = getpwnam(user);
                if (p) {
+                       in->user = strdup(user);
                        in->uid = p->pw_uid;
                        in->gid = p->pw_gid;
                }
@@ -951,6 +972,7 @@ instance_config_move(struct service_instance *in, struct service_instance *in_sr
        in->respawn_timeout = in_src->respawn_timeout;
        in->name = in_src->name;
        in->trace = in_src->trace;
+       in->seccomp = in_src->seccomp;
        in->node.avl.key = in_src->node.avl.key;
 
        free(in->config);
@@ -986,6 +1008,7 @@ instance_free(struct service_instance *in)
        watch_del(in);
        instance_config_cleanup(in);
        free(in->config);
+       free(in->user);
        free(in);
 }