X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=service%2Finstance.c;h=8d2001aa044cb076c2c1ef2110bcd65aa742aeba;hp=fa3594b710e0d453f8c6443f0e0557e060c5cf20;hb=29f139217c71c8753643779c800788783bf43c23;hpb=0467aebb79f64d1c9d05a84367fda7c02c4ea6b8

diff --git a/service/instance.c b/service/instance.c
index fa3594b..8d2001a 100644
--- a/service/instance.c
+++ b/service/instance.c
@@ -15,10 +15,14 @@
 #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 <fcntl.h>
+#include <pwd.h>
+#include <libgen.h>
+#include <unistd.h>
 
 #include <libubox/md5.h>
 
@@ -39,6 +43,13 @@ enum {
 	INSTANCE_ATTR_NICE,
 	INSTANCE_ATTR_LIMITS,
 	INSTANCE_ATTR_WATCH,
+	INSTANCE_ATTR_ERROR,
+	INSTANCE_ATTR_USER,
+	INSTANCE_ATTR_STDOUT,
+	INSTANCE_ATTR_STDERR,
+	INSTANCE_ATTR_JAIL,
+	INSTANCE_ATTR_TRACE,
+	INSTANCE_ATTR_SECCOMP,
 	__INSTANCE_ATTR_MAX
 };
 
@@ -53,6 +64,34 @@ static const struct blobmsg_policy instance_attr[__INSTANCE_ATTR_MAX] = {
 	[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_JAIL] = { "jail", BLOBMSG_TYPE_TABLE },
+	[INSTANCE_ATTR_TRACE] = { "trace", BLOBMSG_TYPE_BOOL },
+	[INSTANCE_ATTR_SECCOMP] = { "seccomp", BLOBMSG_TYPE_STRING },
+};
+
+enum {
+	JAIL_ATTR_NAME,
+	JAIL_ATTR_ROOT,
+	JAIL_ATTR_PROCFS,
+	JAIL_ATTR_SYSFS,
+	JAIL_ATTR_UBUS,
+	JAIL_ATTR_LOG,
+	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_ROOT] = { "root", 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_MOUNT] = { "mount", BLOBMSG_TYPE_TABLE },
 };
 
 struct instance_netdev {
@@ -88,6 +127,14 @@ static const struct rlimit_name rlimit_names[] = {
 	{ 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)
 {
@@ -120,14 +167,65 @@ instance_limits(const char *limit, const char *value)
 	}
 }
 
+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->root) {
+		argv[argc++] = "-P";
+		argv[argc++] = jail->root;
+	}
+
+	if (in->seccomp) {
+		argv[argc++] = "-S";
+		argv[argc++] = in->seccomp;
+	}
+
+	if (jail->procfs)
+		argv[argc++] = "-p";
+
+	if (jail->sysfs)
+		argv[argc++] = "-s";
+
+	if (jail->ubus)
+		argv[argc++] = "-u";
+
+	if (jail->log)
+		argv[argc++] = "-l";
+
+	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 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;
 	int argc = 1; /* NULL terminated */
-	int rem, fd;
+	int rem, _stdin;
 
 	if (in->nice)
 		setpriority(PRIO_PROCESS, 0, in->nice);
@@ -138,23 +236,55 @@ instance_run(struct service_instance *in)
 	blobmsg_list_for_each(&in->env, var)
 		setenv(blobmsg_name(var->data), blobmsg_data(var->data), 1);
 
+	if (!in->trace && !in->has_jail && in->seccomp) {
+		setenv("SECCOMP_FILE", in->seccomp, 1);
+		setenv("LD_PRELOAD", "/lib/libpreload-seccomp.so", 1);
+	}
+
 	blobmsg_list_for_each(&in->limits, var)
 		instance_limits(blobmsg_name(var->data), blobmsg_data(var->data));
 
-	argv = alloca(sizeof(char *) * argc);
+	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->uid || in->gid) {
+		setuid(in->uid);
+		setgid(in->gid);
 	}
 	execvp(argv[0], argv);
 	exit(127);
@@ -164,10 +294,31 @@ void
 instance_start(struct service_instance *in)
 {
 	int pid;
+	int opipe[2] = { -1, -1 };
+	int epipe[2] = { -1, -1 };
+
+	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->proc.pending)
 		return;
 
+	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;
 
@@ -180,7 +331,9 @@ 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;
 	}
 
@@ -188,6 +341,61 @@ instance_start(struct service_instance *in)
 	in->proc.pid = pid;
 	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;
+
+	do {
+		str = ustream_get_read_buf(s, NULL);
+		if (!str)
+			break;
+
+		newline = strchr(str, '\n');
+		if (!newline)
+			break;
+
+		*newline = 0;
+		len = newline + 1 - str;
+
+		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);
+		ulog(prio, "%s\n", str);
+		ulog_open(ULOG_SYSLOG, LOG_DAEMON, "procd");
+
+		ustream_consume(s, len);
+	} while (1);
+}
+
+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
@@ -236,6 +444,7 @@ instance_exit(struct uloop_process *p, int ret)
 			uloop_timeout_set(&in->timeout, in->respawn_timeout * 1000);
 		}
 	}
+	service_event("instance.stop", in->srv->name, in->name);
 }
 
 void
@@ -282,9 +491,21 @@ 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 (!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;
 }
 
@@ -347,6 +568,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)
 {
@@ -366,6 +596,59 @@ 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_ROOT]) {
+		jail->root = blobmsg_get_string(tb[JAIL_ATTR_ROOT]);
+		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_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)
 {
@@ -410,9 +693,7 @@ instance_config_parse(struct service_instance *in)
 		in->respawn_retry = vals[2];
 	}
 	if (tb[INSTANCE_ATTR_TRIGGER]) {
-		in->trigger = blob_memdup(tb[INSTANCE_ATTR_TRIGGER]);
-		if (!in->trigger)
-			return -1;
+		in->trigger = tb[INSTANCE_ATTR_TRIGGER];
 		trigger_add(in->trigger, in);
 	}
 
@@ -431,10 +712,38 @@ instance_config_parse(struct service_instance *in)
 			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 (!in->trace && tb[INSTANCE_ATTR_SECCOMP]) {
+		char *seccomp = blobmsg_get_string(tb[INSTANCE_ATTR_SECCOMP]);
+		struct stat s;
 
-	if (!instance_fill_array(&in->data, tb[INSTANCE_ATTR_DATA], NULL, false))
+		if (stat(seccomp, &s))
+			ERROR("%s: not starting seccomp as %s is missing\n", in->name, seccomp);
+		else
+			in->seccomp = seccomp;
+	}
+	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))
@@ -446,6 +755,9 @@ instance_config_parse(struct service_instance *in)
 	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;
 }
 
@@ -457,6 +769,8 @@ instance_config_cleanup(struct service_instance *in)
 	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
@@ -468,6 +782,8 @@ instance_config_move(struct service_instance *in, struct service_instance *in_sr
 	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->name = in_src->name;
@@ -502,11 +818,20 @@ instance_update(struct service_instance *in, struct service_instance *in_new)
 void
 instance_free(struct service_instance *in)
 {
+	if (in->_stdout.fd.fd > -1) {
+		ustream_free(&in->_stdout.stream);
+		close(in->_stdout.fd.fd);
+	}
+
+	if (in->_stderr.fd.fd > -1) {
+		ustream_free(&in->_stderr.stream);
+		close(in->_stderr.fd.fd);
+	}
+
 	uloop_process_delete(&in->proc);
 	uloop_timeout_cancel(&in->timeout);
 	trigger_del(in);
 	watch_del(in);
-	free(in->trigger);
 	instance_config_cleanup(in);
 	free(in->config);
 	free(in);
@@ -522,11 +847,21 @@ instance_init(struct service_instance *in, struct service *s, struct blob_attr *
 	in->timeout.cb = instance_timeout;
 	in->proc.cb = instance_exit;
 
+	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);
 }
 
@@ -540,6 +875,14 @@ void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose)
 		blobmsg_add_u32(b, "pid", in->proc.pid);
 	blobmsg_add_blob(b, in->command);
 
+	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;
 		void *e = blobmsg_open_table(b, "env");
@@ -548,6 +891,14 @@ 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");
@@ -564,6 +915,32 @@ void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose)
 		blobmsg_close_table(b, r);
 	}
 
+	if (in->trace)
+		blobmsg_add_u8(b, "trace", true);
+
+	if (in->seccomp)
+		blobmsg_add_string(b, "seccomp", in->seccomp);
+
+	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.root)
+			blobmsg_add_string(b, "root", in->jail.root);
+		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_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);