machine: make sure unpriviliged "machinectl status" can show the machine's OS version

[elogind.git] / src / activate / activate.c

diff --git a/src/activate/activate.c b/src/activate/activate.c
index 7fcb0a97c495df868eedbf95b2cb904ad101d724..89427738663de4ed8a8e438647b8bf8f810ed3eb 100644 (file)
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -27,7 +27,7 @@
 #include <sys/wait.h>
 #include <getopt.h>
 
 #include <sys/wait.h>
 #include <getopt.h>
 

-#include <systemd/sd-daemon.h>
+#include "systemd/sd-daemon.h"

 
 #include "socket-util.h"
 #include "build.h"
 
 #include "socket-util.h"
 #include "build.h"


@@ -38,82 +38,31 @@
 static char** arg_listen = NULL;
 static bool arg_accept = false;
 static char** arg_args = NULL;
 static char** arg_listen = NULL;
 static bool arg_accept = false;
 static char** arg_args = NULL;

+static char** arg_setenv = NULL;

 
 static int add_epoll(int epoll_fd, int fd) {
 
 static int add_epoll(int epoll_fd, int fd) {

+        struct epoll_event ev = {
+                .events = EPOLLIN
+        };

         int r;
         int r;

-        struct epoll_event ev = {EPOLLIN};
-        ev.data.fd = fd;

 
         assert(epoll_fd >= 0);
         assert(fd >= 0);
 
 
         assert(epoll_fd >= 0);
         assert(fd >= 0);
 

+        ev.data.fd = fd;

         r = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd, &ev);
         r = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd, &ev);

-        if (r < 0)
-                log_error("Failed to add event on epoll fd:%d for fd:%d: %s",
-                          epoll_fd, fd, strerror(-r));
-        return r;
-}
-
-static int set_nocloexec(int fd) {
-        int flags;
-
-        flags = fcntl(fd, F_GETFD);
-        if (flags < 0) {
-                log_error("Querying flags for fd:%d: %m", fd);
-                return -errno;
-        }
-
-        if (!(flags & FD_CLOEXEC))
-                return 0;
-
-        if (fcntl(fd, F_SETFD, flags & ~FD_CLOEXEC) < 0) {
-                log_error("Settings flags for fd:%d: %m", fd);
-                return -errno;
-        }
-
-        return 0;
-}
-
-static int print_socket(const char* desc, int fd) {
-        int r;
-        SocketAddress addr = {
-                .size = sizeof(union sockaddr_union),
-                .type = SOCK_STREAM,
-        };
-        int family;
-
-        r = getsockname(fd, &addr.sockaddr.sa, &addr.size);

         if (r < 0) {
         if (r < 0) {

-                log_warning("Failed to query socket on fd:%d: %m", fd);
-                return 0;
-        }
-
-        family = socket_address_family(&addr);
-        switch(family) {
-        case AF_INET:
-        case AF_INET6: {
-                char* _cleanup_free_ a = NULL;
-                r = socket_address_print(&addr, &a);
-                if (r < 0)
-                        log_warning("socket_address_print(): %s", strerror(-r));
-                else
-                        log_info("%s %s address %s",
-                                 desc,
-                                 family == AF_INET ? "IP" : "IPv6",
-                                 a);
-                break;
-        }
-        default:
-                log_warning("Connection with unknown family %d", family);
+                log_error("Failed to add event on epoll fd:%d for fd:%d: %m", epoll_fd, fd);
+                return -errno;

         }
 
         return 0;
 }
 
 static int open_sockets(int *epoll_fd, bool accept) {
         }
 
         return 0;
 }
 
 static int open_sockets(int *epoll_fd, bool accept) {

-        int n, fd;
-        int count = 0;

         char **address;
         char **address;

+        int n, fd, r;
+        int count = 0;

 
         n = sd_listen_fds(true);
         if (n < 0) {
 
         n = sd_listen_fds(true);
         if (n < 0) {


@@ -121,33 +70,50 @@ static int open_sockets(int *epoll_fd, bool accept) {
                           strerror(-n));
                 return n;
         }
                           strerror(-n));
                 return n;
         }

-        log_info("Received %d descriptors", n);
+        if (n > 0) {
+                log_info("Received %i descriptors via the environment.", n);

 
 

-        for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd++) {
-                log_debug("Received descriptor fd:%d", fd);
-                print_socket("Listening on", fd);
-
-                if (!arg_accept) {
-                        int r = set_nocloexec(fd);
+                for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd++) {
+                        r = fd_cloexec(fd, arg_accept);

                         if (r < 0)
                                 return r;
                         if (r < 0)
                                 return r;

+
+                        count ++;

                 }
                 }

+        }

 
 

-                count ++;
+        /* Close logging and all other descriptors */
+        if (arg_listen) {
+                int except[3 + n];
+
+                for (fd = 0; fd < SD_LISTEN_FDS_START + n; fd++)
+                        except[fd] = fd;
+
+                log_close();
+                close_all_fds(except, 3 + n);

         }
 
         }
 

+        /** Note: we leak some fd's on error here. I doesn't matter
+         *  much, since the program will exit immediately anyway, but
+         *  would be a pain to fix.
+         */
+

         STRV_FOREACH(address, arg_listen) {
         STRV_FOREACH(address, arg_listen) {

-                log_info("Opening address %s", *address);

 
 

-                fd = make_socket_fd(*address, SOCK_STREAM | (arg_accept*SOCK_CLOEXEC));
+                fd = make_socket_fd(LOG_DEBUG, *address, SOCK_STREAM | (arg_accept*SOCK_CLOEXEC));

                 if (fd < 0) {
                 if (fd < 0) {

+                        log_open();

                         log_error("Failed to open '%s': %s", *address, strerror(-fd));
                         return fd;
                 }
 
                         log_error("Failed to open '%s': %s", *address, strerror(-fd));
                         return fd;
                 }
 

+                assert(fd == SD_LISTEN_FDS_START + count);

                 count ++;
         }
 
                 count ++;
         }
 

+        if (arg_listen)
+                log_open();
+

         *epoll_fd = epoll_create1(EPOLL_CLOEXEC);
         if (*epoll_fd < 0) {
                 log_error("Failed to create epoll object: %m");
         *epoll_fd = epoll_create1(EPOLL_CLOEXEC);
         if (*epoll_fd < 0) {
                 log_error("Failed to create epoll object: %m");


@@ -155,7 +121,12 @@ static int open_sockets(int *epoll_fd, bool accept) {
         }
 
         for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + count; fd++) {
         }
 
         for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + count; fd++) {

-                int r = add_epoll(*epoll_fd, fd);
+                _cleanup_free_ char *name = NULL;
+
+                getsockname_pretty(fd, &name);
+                log_info("Listening on %s as %i.", strna(name), fd);
+
+                r = add_epoll(*epoll_fd, fd);

                 if (r < 0)
                         return r;
         }
                 if (r < 0)
                         return r;
         }


@@ -163,15 +134,37 @@ static int open_sockets(int *epoll_fd, bool accept) {
         return count;
 }
 
         return count;
 }
 

-static int launch(char* name, char **argv, char **environ, int fds) {
-        unsigned n_env = 0;
-        char* envp[7] = {NULL}; /* PATH, TERM, HOME, USER, LISTEN_FDS, LISTEN_PID */
+static int launch(char* name, char **argv, char **env, int fds) {
+

         static const char* tocopy[] = {"TERM=", "PATH=", "USER=", "HOME="};
         static const char* tocopy[] = {"TERM=", "PATH=", "USER=", "HOME="};

-        char _cleanup_free_ *tmp = NULL;
+        _cleanup_strv_free_ char **envp = NULL;
+        _cleanup_free_ char *tmp = NULL;
+        unsigned n_env = 0, length;
+        char **s;

         unsigned i;
 
         unsigned i;
 

+        length = strv_length(arg_setenv);
+
+        /* PATH, TERM, HOME, USER, LISTEN_FDS, LISTEN_PID, NULL */
+        envp = new0(char *, length + 7);
+        if (!envp)
+                return log_oom();
+
+        STRV_FOREACH(s, arg_setenv) {
+                if (strchr(*s, '='))
+                        envp[n_env++] = *s;
+                else {
+                        _cleanup_free_ char *p = strappend(*s, "=");
+                        if (!p)
+                                return log_oom();
+                        envp[n_env] = strv_find_prefix(env, p);
+                        if (envp[n_env])
+                                n_env ++;
+                }
+        }
+

         for (i = 0; i < ELEMENTSOF(tocopy); i++) {
         for (i = 0; i < ELEMENTSOF(tocopy); i++) {

-                envp[n_env] = strv_find_prefix(environ, tocopy[i]);
+                envp[n_env] = strv_find_prefix(env, tocopy[i]);

                 if (envp[n_env])
                         n_env ++;
         }
                 if (envp[n_env])
                         n_env ++;
         }


@@ -187,14 +180,15 @@ static int launch(char* name, char **argv, char **environ, int fds) {
         log_info("Execing %s (%s)", name, tmp);
         execvpe(name, argv, envp);
         log_error("Failed to execp %s (%s): %m", name, tmp);
         log_info("Execing %s (%s)", name, tmp);
         execvpe(name, argv, envp);
         log_error("Failed to execp %s (%s): %m", name, tmp);

+

         return -errno;
 }
 
         return -errno;
 }
 

-static int launch1(const char* child, char** argv, char **environ, int fd) {
+static int launch1(const char* child, char** argv, char **env, int fd) {
+        _cleanup_free_ char *tmp = NULL;

         pid_t parent_pid, child_pid;
         int r;
 
         pid_t parent_pid, child_pid;
         int r;
 

-        char _cleanup_free_ *tmp = NULL;

         tmp = strv_join(argv, " ");
         if (!tmp)
                 return log_oom();
         tmp = strv_join(argv, " ");
         if (!tmp)
                 return log_oom();


@@ -247,38 +241,37 @@ static int launch1(const char* child, char** argv, char **environ, int fd) {
 }
 
 static int do_accept(const char* name, char **argv, char **envp, int fd) {
 }
 
 static int do_accept(const char* name, char **argv, char **envp, int fd) {

-        SocketAddress addr = {
-                .size = sizeof(union sockaddr_union),
-                .type = SOCK_STREAM,
-        };
-        int fd2, r;
+        _cleanup_free_ char *local = NULL, *peer = NULL;
+        int fd2;

 
 

-        fd2 = accept(fd, &addr.sockaddr.sa, &addr.size);
+        fd2 = accept(fd, NULL, NULL);

         if (fd2 < 0) {
                 log_error("Failed to accept connection on fd:%d: %m", fd);
                 return fd2;
         }
 
         if (fd2 < 0) {
                 log_error("Failed to accept connection on fd:%d: %m", fd);
                 return fd2;
         }
 

-        print_socket("Connection from", fd2);
+        getsockname_pretty(fd2, &local);
+        getpeername_pretty(fd2, &peer);
+        log_info("Connection from %s to %s", strna(peer), strna(local));

 
 

-        r = launch1(name, argv, envp, fd2);
-        return r;
+        return launch1(name, argv, envp, fd2);

 }
 
 /* SIGCHLD handler. */
 }
 
 /* SIGCHLD handler. */

-static void sigchld_hdl(int sig, siginfo_t *t, void *data)
-{
+static void sigchld_hdl(int sig, siginfo_t *t, void *data) {
+        PROTECT_ERRNO;
+

         log_info("Child %d died with code %d", t->si_pid, t->si_status);
         log_info("Child %d died with code %d", t->si_pid, t->si_status);

-       /* Wait for a dead child. */
-       waitpid(t->si_pid, NULL, 0);
+        /* Wait for a dead child. */
+        waitpid(t->si_pid, NULL, 0);

 }
 
 static int install_chld_handler(void) {
         int r;
 }
 
 static int install_chld_handler(void) {
         int r;

-       struct sigaction act;
-        zero(act);
-        act.sa_flags = SA_SIGINFO;
-        act.sa_sigaction = sigchld_hdl;
+        struct sigaction act = {
+                .sa_flags = SA_SIGINFO,
+                .sa_sigaction = sigchld_hdl,
+        };

 
         r = sigaction(SIGCHLD, &act, 0);
         if (r < 0)
 
         r = sigaction(SIGCHLD, &act, 0);
         if (r < 0)


@@ -286,20 +279,18 @@ static int install_chld_handler(void) {
         return r;
 }
 
         return r;
 }
 

-static int help(void) {
+static void help(void) {

         printf("%s [OPTIONS...]\n\n"
                "Listen on sockets and launch child on connection.\n\n"
                "Options:\n"
         printf("%s [OPTIONS...]\n\n"
                "Listen on sockets and launch child on connection.\n\n"
                "Options:\n"

-               "  -l --listen=ADDR     Listen for raw connections at ADDR\n"
-               "  -a --accept          Spawn separate child for each connection\n"
-               "  -h --help            Show this help and exit\n"
-               "  --version            Print version string and exit\n"
+               "  -l --listen=ADDR         Listen for raw connections at ADDR\n"
+               "  -a --accept              Spawn separate child for each connection\n"
+               "  -h --help                Show this help and exit\n"
+               "  -E --setenv=NAME[=VALUE] Pass an environment variable to children\n"
+               "  --version                Print version string and exit\n"

                "\n"
                "Note: file descriptors from sd_listen_fds() will be passed through.\n"
                "\n"
                "Note: file descriptors from sd_listen_fds() will be passed through.\n"

-               , program_invocation_short_name
-               );
-
-        return 0;
+               , program_invocation_short_name);

 }
 
 static int parse_argv(int argc, char *argv[]) {
 }
 
 static int parse_argv(int argc, char *argv[]) {


@@ -308,11 +299,13 @@ static int parse_argv(int argc, char *argv[]) {
         };
 
         static const struct option options[] = {
         };
 
         static const struct option options[] = {

-                { "help",         no_argument,       NULL, 'h'           },
-                { "version",      no_argument,       NULL, ARG_VERSION   },
-                { "listen",       required_argument, NULL, 'l'           },
-                { "accept",       no_argument,       NULL, 'a'           },
-                { NULL,           0,                 NULL, 0             }
+                { "help",        no_argument,       NULL, 'h'           },
+                { "version",     no_argument,       NULL, ARG_VERSION   },
+                { "listen",      required_argument, NULL, 'l'           },
+                { "accept",      no_argument,       NULL, 'a'           },
+                { "setenv",      required_argument, NULL, 'E'           },
+                { "environment", required_argument, NULL, 'E'           }, /* alias */
+                {}

         };
 
         int c;
         };
 
         int c;


@@ -320,11 +313,11 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
         assert(argc >= 0);
         assert(argv);
 

-        while ((c = getopt_long(argc, argv, "+hl:sa", options, NULL)) >= 0)
+        while ((c = getopt_long(argc, argv, "+hl:aE:", options, NULL)) >= 0)

                 switch(c) {
                 case 'h':
                         help();
                 switch(c) {
                 case 'h':
                         help();

-                        return 0 /* done */;
+                        return 0;

 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);
 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);


@@ -343,16 +336,23 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_accept = true;
                         break;
 
                         arg_accept = true;
                         break;
 

+                case 'E': {
+                        int r = strv_extend(&arg_setenv, optarg);
+                        if (r < 0)
+                                return r;
+
+                        break;
+                }
+

                 case '?':
                         return -EINVAL;
 
                 default:
                 case '?':
                         return -EINVAL;
 
                 default:

-                        log_error("Unknown option code %c", c);
-                        return -EINVAL;
+                        assert_not_reached("Unhandled option");

                 }
 
         if (optind == argc) {
                 }
 
         if (optind == argc) {

-                log_error("Usage: %s [OPTION...] PROGRAM [OPTION...]",
+                log_error("%s: command to execute is missing.",

                           program_invocation_short_name);
                 return -EINVAL;
         }
                           program_invocation_short_name);
                 return -EINVAL;
         }


@@ -366,9 +366,8 @@ int main(int argc, char **argv, char **envp) {
         int r, n;
         int epoll_fd = -1;
 
         int r, n;
         int epoll_fd = -1;
 

-        log_set_max_level(LOG_DEBUG);
-        log_show_color(true);

         log_parse_environment();
         log_parse_environment();

+        log_open();

 
         r = parse_argv(argc, argv);
         if (r <= 0)
 
         r = parse_argv(argc, argv);
         if (r <= 0)


@@ -381,8 +380,12 @@ int main(int argc, char **argv, char **envp) {
         n = open_sockets(&epoll_fd, arg_accept);
         if (n < 0)
                 return EXIT_FAILURE;
         n = open_sockets(&epoll_fd, arg_accept);
         if (n < 0)
                 return EXIT_FAILURE;

+        if (n == 0) {
+                log_error("No sockets to listen on specified or passed in.");
+                return EXIT_FAILURE;
+        }

 
 

-        while (true) {
+        for (;;) {

                 struct epoll_event event;
 
                 r = epoll_wait(epoll_fd, &event, 1, -1);
                 struct epoll_event event;
 
                 r = epoll_wait(epoll_fd, &event, 1, -1);


@@ -394,7 +397,7 @@ int main(int argc, char **argv, char **envp) {
                         return EXIT_FAILURE;
                 }
 
                         return EXIT_FAILURE;
                 }
 

-                log_info("Communication attempt on fd:%d", event.data.fd);
+                log_info("Communication attempt on fd %i.", event.data.fd);

                 if (arg_accept) {
                         r = do_accept(argv[optind], argv + optind, envp,
                                       event.data.fd);
                 if (arg_accept) {
                         r = do_accept(argv[optind], argv + optind, envp,
                                       event.data.fd);