procd: fire events at instance respawn and failure

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

diff --git a/service/instance.c b/service/instance.c
index c478d4b..b783966 100644 (file)
--- a/service/instance.c
+++ b/service/instance.c
@@ -49,9 +49,11 @@ enum {
        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_MAX
 };
 
@@ -70,27 +72,33 @@ static const struct blobmsg_policy instance_attr[__INSTANCE_ATTR_MAX] = {
        [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 },
 };
 
 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 },
 };
 
@@ -116,14 +124,16 @@ static const struct rlimit_name rlimit_names[] = {
        { "data", RLIMIT_DATA },
        { "fsize", RLIMIT_FSIZE },
        { "memlock", RLIMIT_MEMLOCK },
-       { "msgqueue", RLIMIT_MSGQUEUE },
-       { "nice", RLIMIT_NICE },
        { "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 },
-       { "stack", RLIMIT_STACK },
+#endif
        { NULL, 0 }
 };
 
@@ -181,11 +191,19 @@ jail_run(struct service_instance *in, char **argv)
                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";
 
@@ -198,6 +216,9 @@ jail_run(struct service_instance *in, char **argv)
        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);
 
@@ -213,6 +234,46 @@ jail_run(struct service_instance *in, char **argv)
        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));
+               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, int _stdout, int _stderr)
 {
@@ -361,8 +422,9 @@ instance_start(struct service_instance *in)
                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);
 
@@ -451,7 +513,7 @@ instance_exit(struct uloop_process *p, int ret)
 
        uloop_timeout_cancel(&in->timeout);
        if (in->halt) {
-               /* no action */
+               instance_removepid(in);
        } else if (in->restart) {
                instance_start(in);
        } else if (in->respawn) {
@@ -464,7 +526,9 @@ 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);
                }
        }
@@ -489,6 +553,7 @@ instance_restart(struct service_instance *in)
        in->halt = false;
        in->restart = true;
        kill(in->proc.pid, SIGTERM);
+       instance_removepid(in);
 }
 
 static bool
@@ -521,6 +586,16 @@ instance_config_changed(struct service_instance *in, struct service_instance *in
        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;
 
@@ -639,6 +714,10 @@ instance_jail_parse(struct service_instance *in, struct blob_attr *attr)
                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++;
@@ -655,6 +734,10 @@ instance_jail_parse(struct service_instance *in, struct blob_attr *attr)
                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;
@@ -743,6 +826,9 @@ instance_config_parse(struct service_instance *in)
        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 (!in->trace && tb[INSTANCE_ATTR_SECCOMP]) {
                char *seccomp = blobmsg_get_string(tb[INSTANCE_ATTR_SECCOMP]);
                struct stat s;
@@ -752,6 +838,13 @@ instance_config_parse(struct service_instance *in)
                else
                        in->seccomp = seccomp;
        }
+
+       if (tb[INSTANCE_ATTR_PIDFILE]) {
+               char *pidfile = blobmsg_get_string(tb[INSTANCE_ATTR_PIDFILE]);
+               if (pidfile)
+                       in->pidfile = pidfile;
+       }
+
        if (!in->trace && tb[INSTANCE_ATTR_JAIL])
                in->has_jail = instance_jail_parse(in, tb[INSTANCE_ATTR_JAIL]);
 
@@ -806,6 +899,7 @@ instance_config_move(struct service_instance *in, struct service_instance *in_sr
        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;
 
@@ -932,17 +1026,26 @@ void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose)
        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;