X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=execute.c;h=357fd5c20874aea7a6c670b89f7e737f64aa3fb1;hp=73d82d5a76218ac50d839ec80466b8d6fe5e80e1;hb=8d567588cad053f79abe603ab113e1b85a92f1da;hpb=d8b4e2e9acb8c68cd46405ae1e9b8fb06cb75269

diff --git a/execute.c b/execute.c
index 73d82d5a7..357fd5c20 100644
--- a/execute.c
+++ b/execute.c
@@ -222,10 +222,41 @@ static bool is_terminal_input(ExecInput i) {
                 i == EXEC_INPUT_TTY_FAIL;
 }
 
-static int setup_input(const ExecContext *context) {
+static int fixup_input(const ExecContext *context, int socket_fd) {
         assert(context);
 
-        switch (context->std_input) {
+        if (socket_fd < 0 && context->std_input == EXEC_INPUT_SOCKET)
+                return EXEC_INPUT_NULL;
+
+        return context->std_input;
+}
+
+static int fixup_output(const ExecContext *context, int socket_fd) {
+        assert(context);
+
+        if (socket_fd < 0 && context->std_output == EXEC_OUTPUT_SOCKET)
+                return EXEC_OUTPUT_INHERIT;
+
+        return context->std_output;
+}
+
+static int fixup_error(const ExecContext *context, int socket_fd) {
+        assert(context);
+
+        if (socket_fd < 0 && context->std_error == EXEC_OUTPUT_SOCKET)
+                return EXEC_OUTPUT_INHERIT;
+
+        return context->std_error;
+}
+
+static int setup_input(const ExecContext *context, int socket_fd) {
+        ExecInput i;
+
+        assert(context);
+
+        i = fixup_input(context, socket_fd);
+
+        switch (i) {
 
         case EXEC_INPUT_NULL:
                 return open_null_as(O_RDONLY, STDIN_FILENO);
@@ -237,8 +268,8 @@ static int setup_input(const ExecContext *context) {
 
                 if ((fd = acquire_terminal(
                                      tty_path(context),
-                                     context->std_input == EXEC_INPUT_TTY_FAIL,
-                                     context->std_input == EXEC_INPUT_TTY_FORCE)) < 0)
+                                     i == EXEC_INPUT_TTY_FAIL,
+                                     i == EXEC_INPUT_TTY_FORCE)) < 0)
                         return fd;
 
                 if (fd != STDIN_FILENO) {
@@ -250,72 +281,90 @@ static int setup_input(const ExecContext *context) {
                 return r;
         }
 
+        case EXEC_INPUT_SOCKET:
+                return dup2(socket_fd, STDIN_FILENO) < 0 ? -errno : STDIN_FILENO;
+
         default:
                 assert_not_reached("Unknown input type");
         }
 }
 
-static int setup_output(const ExecContext *context, const char *ident) {
+static int setup_output(const ExecContext *context, int socket_fd, const char *ident) {
+        ExecOutput o;
+        ExecInput i;
+
         assert(context);
         assert(ident);
 
+        i = fixup_input(context, socket_fd);
+        o = fixup_output(context, socket_fd);
+
         /* This expects the input is already set up */
 
-        switch (context->std_output) {
+        switch (o) {
 
         case EXEC_OUTPUT_INHERIT:
 
                 /* If the input is connected to a terminal, inherit that... */
-                if (is_terminal_input(context->std_input))
+                if (is_terminal_input(i) || i == EXEC_INPUT_SOCKET)
                         return dup2(STDIN_FILENO, STDOUT_FILENO) < 0 ? -errno : STDOUT_FILENO;
 
-                return 0;
+                return STDIN_FILENO;
 
         case EXEC_OUTPUT_NULL:
                 return open_null_as(O_WRONLY, STDOUT_FILENO);
 
-        case EXEC_OUTPUT_TTY: {
-                if (is_terminal_input(context->std_input))
+        case EXEC_OUTPUT_TTY:
+                if (is_terminal_input(i))
                         return dup2(STDIN_FILENO, STDOUT_FILENO) < 0 ? -errno : STDOUT_FILENO;
 
                 /* We don't reset the terminal if this is just about output */
                 return open_terminal_as(tty_path(context), O_WRONLY, STDOUT_FILENO);
-        }
 
         case EXEC_OUTPUT_SYSLOG:
         case EXEC_OUTPUT_KERNEL:
-                return connect_logger_as(context, context->std_output, ident, STDOUT_FILENO);
+                return connect_logger_as(context, o, ident, STDOUT_FILENO);
+
+        case EXEC_OUTPUT_SOCKET:
+                assert(socket_fd >= 0);
+                return dup2(socket_fd, STDOUT_FILENO) < 0 ? -errno : STDOUT_FILENO;
 
         default:
                 assert_not_reached("Unknown output type");
         }
 }
 
-static int setup_error(const ExecContext *context, const char *ident) {
+static int setup_error(const ExecContext *context, int socket_fd, const char *ident) {
+        ExecOutput o, e;
+        ExecInput i;
+
         assert(context);
         assert(ident);
 
+        i = fixup_input(context, socket_fd);
+        o = fixup_output(context, socket_fd);
+        e = fixup_error(context, socket_fd);
+
         /* This expects the input and output are already set up */
 
         /* Don't change the stderr file descriptor if we inherit all
          * the way and are not on a tty */
-        if (context->std_error == EXEC_OUTPUT_INHERIT &&
-            context->std_output == EXEC_OUTPUT_INHERIT &&
-            !is_terminal_input(context->std_input))
+        if (e == EXEC_OUTPUT_INHERIT &&
+            o == EXEC_OUTPUT_INHERIT &&
+            !is_terminal_input(i))
                 return STDERR_FILENO;
 
         /* Duplicate form stdout if possible */
-        if (context->std_error == context->std_output ||
-            context->std_error == EXEC_OUTPUT_INHERIT)
+        if (e == o || e == EXEC_OUTPUT_INHERIT)
                 return dup2(STDOUT_FILENO, STDERR_FILENO) < 0 ? -errno : STDERR_FILENO;
 
-        switch (context->std_error) {
+        switch (e) {
 
         case EXEC_OUTPUT_NULL:
                 return open_null_as(O_WRONLY, STDERR_FILENO);
 
         case EXEC_OUTPUT_TTY:
-                if (is_terminal_input(context->std_input))
+                if (is_terminal_input(i))
                         return dup2(STDIN_FILENO, STDERR_FILENO) < 0 ? -errno : STDERR_FILENO;
 
                 /* We don't reset the terminal if this is just about output */
@@ -323,7 +372,11 @@ static int setup_error(const ExecContext *context, const char *ident) {
 
         case EXEC_OUTPUT_SYSLOG:
         case EXEC_OUTPUT_KERNEL:
-                return connect_logger_as(context, context->std_error, ident, STDERR_FILENO);
+                return connect_logger_as(context, e, ident, STDERR_FILENO);
+
+        case EXEC_OUTPUT_SOCKET:
+                assert(socket_fd >= 0);
+                return dup2(socket_fd, STDERR_FILENO) < 0 ? -errno : STDERR_FILENO;
 
         default:
                 assert_not_reached("Unknown error type");
@@ -665,6 +718,7 @@ static int enforce_user(const ExecContext *context, uid_t uid) {
 }
 
 int exec_spawn(ExecCommand *command,
+               char **argv,
                const ExecContext *context,
                int fds[], unsigned n_fds,
                bool apply_permissions,
@@ -676,13 +730,31 @@ int exec_spawn(ExecCommand *command,
         pid_t pid;
         int r;
         char *line;
+        int socket_fd;
 
         assert(command);
         assert(context);
         assert(ret);
         assert(fds || n_fds <= 0);
 
-        if (!(line = exec_command_line(command)))
+        if (context->std_input == EXEC_INPUT_SOCKET ||
+            context->std_output == EXEC_OUTPUT_SOCKET ||
+            context->std_error == EXEC_OUTPUT_SOCKET) {
+
+                if (n_fds != 1)
+                        return -EINVAL;
+
+                socket_fd = fds[0];
+
+                fds = NULL;
+                n_fds = 0;
+        } else
+                socket_fd = -1;
+
+        if (!argv)
+                argv = command->argv;
+
+        if (!(line = exec_command_line(argv)))
                 return -ENOMEM;
 
         log_debug("About to execute: %s", line);
@@ -716,10 +788,11 @@ int exec_spawn(ExecCommand *command,
                         goto fail;
                 }
 
-                if (setsid() < 0) {
-                        r = EXIT_SETSID;
-                        goto fail;
-                }
+                if (!context->no_setsid)
+                        if (setsid() < 0) {
+                                r = EXIT_SETSID;
+                                goto fail;
+                        }
 
                 umask(context->umask);
 
@@ -732,7 +805,7 @@ int exec_spawn(ExecCommand *command,
                                 goto fail;
 
                         /* Now ask the question. */
-                        if (!(line = exec_command_line(command))) {
+                        if (!(line = exec_command_line(argv))) {
                                 r = EXIT_MEMORY;
                                 goto fail;
                         }
@@ -756,18 +829,18 @@ int exec_spawn(ExecCommand *command,
                 }
 
                 if (!keep_stdin)
-                        if (setup_input(context) < 0) {
+                        if (setup_input(context, socket_fd) < 0) {
                                 r = EXIT_STDIN;
                                 goto fail;
                         }
 
                 if (!keep_stdout)
-                        if (setup_output(context, file_name_from_path(command->path)) < 0) {
+                        if (setup_output(context, socket_fd, file_name_from_path(command->path)) < 0) {
                                 r = EXIT_STDOUT;
                                 goto fail;
                         }
 
-                if (setup_error(context, file_name_from_path(command->path)) < 0) {
+                if (setup_error(context, socket_fd, file_name_from_path(command->path)) < 0) {
                         r = EXIT_STDERR;
                         goto fail;
                 }
@@ -950,7 +1023,7 @@ int exec_spawn(ExecCommand *command,
                         goto fail;
                 }
 
-                execve(command->path, command->argv, final_env);
+                execve(command->path, argv, final_env);
                 r = EXIT_EXEC;
 
         fail:
@@ -1270,23 +1343,22 @@ void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix) {
                         prefix, s->status);
 }
 
-char *exec_command_line(ExecCommand *c) {
+char *exec_command_line(char **argv) {
         size_t k;
         char *n, *p, **a;
         bool first = true;
 
-        assert(c);
-        assert(c->argv);
+        assert(argv);
 
         k = 1;
-        STRV_FOREACH(a, c->argv)
+        STRV_FOREACH(a, argv)
                 k += strlen(*a)+3;
 
         if (!(n = new(char, k)))
                 return NULL;
 
         p = n;
-        STRV_FOREACH(a, c->argv) {
+        STRV_FOREACH(a, argv) {
 
                 if (!first)
                         *(p++) = ' ';
@@ -1324,7 +1396,7 @@ void exec_command_dump(ExecCommand *c, FILE *f, const char *prefix) {
         p2 = strappend(prefix, "\t");
         prefix2 = p2 ? p2 : prefix;
 
-        cmd = exec_command_line(c);
+        cmd = exec_command_line(c->argv);
 
         fprintf(f,
                 "%sCommand Line: %s\n",
@@ -1498,7 +1570,8 @@ static const char* const exec_input_table[_EXEC_INPUT_MAX] = {
         [EXEC_INPUT_NULL] = "null",
         [EXEC_INPUT_TTY] = "tty",
         [EXEC_INPUT_TTY_FORCE] = "tty-force",
-        [EXEC_INPUT_TTY_FAIL] = "tty-fail"
+        [EXEC_INPUT_TTY_FAIL] = "tty-fail",
+        [EXEC_INPUT_SOCKET] = "socket"
 };
 
 static const char* const exec_output_table[_EXEC_OUTPUT_MAX] = {
@@ -1506,7 +1579,8 @@ static const char* const exec_output_table[_EXEC_OUTPUT_MAX] = {
         [EXEC_OUTPUT_NULL] = "null",
         [EXEC_OUTPUT_TTY] = "tty",
         [EXEC_OUTPUT_SYSLOG] = "syslog",
-        [EXEC_OUTPUT_KERNEL] = "kernel"
+        [EXEC_OUTPUT_KERNEL] = "kernel",
+        [EXEC_OUTPUT_SOCKET] = "socket"
 };
 
 DEFINE_STRING_TABLE_LOOKUP(exec_output, ExecOutput);