update TODO

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

diff --git a/src/run/run.c b/src/run/run.c
index 81763c94ffef0b7bc6cde552e683791292139164..e4c695c5b505f08dcecc050c92c3236b2bb6d872 100644 (file)
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -27,6 +27,7 @@
 #include "strv.h"
 #include "build.h"
 #include "unit-name.h"
 #include "strv.h"
 #include "build.h"
 #include "unit-name.h"

+#include "env-util.h"

 #include "path-util.h"
 #include "bus-error.h"
 
 #include "path-util.h"
 #include "bus-error.h"
 


@@ -37,7 +38,7 @@ static const char *arg_description = NULL;
 static const char *arg_slice = NULL;
 static bool arg_send_sighup = false;
 static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
 static const char *arg_slice = NULL;
 static bool arg_send_sighup = false;
 static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;

-static char *arg_host = NULL;
+static const char *arg_host = NULL;

 static bool arg_user = false;
 static const char *arg_service_type = NULL;
 static const char *arg_exec_user = NULL;
 static bool arg_user = false;
 static const char *arg_service_type = NULL;
 static const char *arg_exec_user = NULL;


@@ -186,7 +187,7 @@ static int parse_argv(int argc, char *argv[]) {
 
                 case ARG_NICE:
                         r = safe_atoi(optarg, &arg_nice);
 
                 case ARG_NICE:
                         r = safe_atoi(optarg, &arg_nice);

-                        if (r < 0) {
+                        if (r < 0 || arg_nice < PRIO_MIN || arg_nice >= PRIO_MAX) {

                                 log_error("Failed to parse nice value");
                                 return -EINVAL;
                         }
                                 log_error("Failed to parse nice value");
                                 return -EINVAL;
                         }


@@ -231,8 +232,8 @@ static int parse_argv(int argc, char *argv[]) {
                 return -EINVAL;
         }
 
                 return -EINVAL;
         }
 

-        if (arg_scope && (arg_remain_after_exit || arg_service_type || arg_exec_user || arg_exec_group || arg_nice_set || arg_environment)) {
-                log_error("--remain-after-exit, --service-type=, --user=, --group=, --nice= and --setenv= are not supported in --scope mode.");
+        if (arg_scope && (arg_remain_after_exit || arg_service_type)) {
+                log_error("--remain-after-exit and --service-type= are not supported in --scope mode.");

                 return -EINVAL;
         }
 
                 return -EINVAL;
         }
 


@@ -248,8 +249,6 @@ static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bu
         assert(name);
         assert(ret);
 
         assert(name);
         assert(ret);
 

-        log_info("Running as unit %s.", name);
-

         r = sd_bus_message_new_method_call(
                         bus,
                         &m,
         r = sd_bus_message_new_method_call(
                         bus,
                         &m,


@@ -339,119 +338,125 @@ static int start_transient_service(
         if (arg_unit)
                 name = unit_name_mangle_with_suffix(arg_unit, MANGLE_NOGLOB, ".service");
         else
         if (arg_unit)
                 name = unit_name_mangle_with_suffix(arg_unit, MANGLE_NOGLOB, ".service");
         else

-                asprintf(&name, "run-%lu.service", (unsigned long) getpid());
+                asprintf(&name, "run-"PID_FMT".service", getpid());

         if (!name)
         if (!name)

-                return -ENOMEM;
+                return log_oom();

 
         r = message_start_transient_unit_new(bus, name, &m);
         if (r < 0)
 
         r = message_start_transient_unit_new(bus, name, &m);
         if (r < 0)

-                return r;
+                return bus_log_create_error(r);

 
         if (arg_remain_after_exit) {
                 r = sd_bus_message_append(m, "(sv)", "RemainAfterExit", "b", arg_remain_after_exit);
                 if (r < 0)
 
         if (arg_remain_after_exit) {
                 r = sd_bus_message_append(m, "(sv)", "RemainAfterExit", "b", arg_remain_after_exit);
                 if (r < 0)

-                        return r;
+                        return bus_log_create_error(r);

         }
 
         if (arg_service_type) {
                 r = sd_bus_message_append(m, "(sv)", "Type", "s", arg_service_type);
                 if (r < 0)
         }
 
         if (arg_service_type) {
                 r = sd_bus_message_append(m, "(sv)", "Type", "s", arg_service_type);
                 if (r < 0)

-                        return r;
+                        return bus_log_create_error(r);

         }
 
         if (arg_exec_user) {
                 r = sd_bus_message_append(m, "(sv)", "User", "s", arg_exec_user);
                 if (r < 0)
         }
 
         if (arg_exec_user) {
                 r = sd_bus_message_append(m, "(sv)", "User", "s", arg_exec_user);
                 if (r < 0)

-                        return r;
+                        return bus_log_create_error(r);

         }
 
         if (arg_exec_group) {
                 r = sd_bus_message_append(m, "(sv)", "Group", "s", arg_exec_group);
                 if (r < 0)
         }
 
         if (arg_exec_group) {
                 r = sd_bus_message_append(m, "(sv)", "Group", "s", arg_exec_group);
                 if (r < 0)

-                        return r;
+                        return bus_log_create_error(r);

         }
 
         if (arg_nice_set) {
                 r = sd_bus_message_append(m, "(sv)", "Nice", "i", arg_nice);
                 if (r < 0)
         }
 
         if (arg_nice_set) {
                 r = sd_bus_message_append(m, "(sv)", "Nice", "i", arg_nice);
                 if (r < 0)

-                        return r;
+                        return bus_log_create_error(r);

         }
 
         if (!strv_isempty(arg_environment)) {
                 r = sd_bus_message_open_container(m, 'r', "sv");
                 if (r < 0)
         }
 
         if (!strv_isempty(arg_environment)) {
                 r = sd_bus_message_open_container(m, 'r', "sv");
                 if (r < 0)

-                        return r;
+                        return bus_log_create_error(r);

 
                 r = sd_bus_message_append(m, "s", "Environment");
                 if (r < 0)
 
                 r = sd_bus_message_append(m, "s", "Environment");
                 if (r < 0)

-                        return r;
+                        return bus_log_create_error(r);

 
                 r = sd_bus_message_open_container(m, 'v', "as");
                 if (r < 0)
 
                 r = sd_bus_message_open_container(m, 'v', "as");
                 if (r < 0)

-                        return r;
+                        return bus_log_create_error(r);

 
                 r = sd_bus_message_append_strv(m, arg_environment);
                 if (r < 0)
 
                 r = sd_bus_message_append_strv(m, arg_environment);
                 if (r < 0)

-                        return r;
+                        return bus_log_create_error(r);

 
                 r = sd_bus_message_close_container(m);
                 if (r < 0)
 
                 r = sd_bus_message_close_container(m);
                 if (r < 0)

-                        return r;
+                        return bus_log_create_error(r);

 
                 r = sd_bus_message_close_container(m);
                 if (r < 0)
 
                 r = sd_bus_message_close_container(m);
                 if (r < 0)

-                        return r;
+                        return bus_log_create_error(r);

         }
 
         r = sd_bus_message_open_container(m, 'r', "sv");
         if (r < 0)
         }
 
         r = sd_bus_message_open_container(m, 'r', "sv");
         if (r < 0)

-                return r;
+                return bus_log_create_error(r);

 
         r = sd_bus_message_append(m, "s", "ExecStart");
         if (r < 0)
 
         r = sd_bus_message_append(m, "s", "ExecStart");
         if (r < 0)

-                return r;
+                return bus_log_create_error(r);

 
         r = sd_bus_message_open_container(m, 'v', "a(sasb)");
         if (r < 0)
 
         r = sd_bus_message_open_container(m, 'v', "a(sasb)");
         if (r < 0)

-                return r;
+                return bus_log_create_error(r);

 
         r = sd_bus_message_open_container(m, 'a', "(sasb)");
         if (r < 0)
 
         r = sd_bus_message_open_container(m, 'a', "(sasb)");
         if (r < 0)

-                return r;
+                return bus_log_create_error(r);

 
         r = sd_bus_message_open_container(m, 'r', "sasb");
         if (r < 0)
 
         r = sd_bus_message_open_container(m, 'r', "sasb");
         if (r < 0)

-                return r;
+                return bus_log_create_error(r);

 
         r = sd_bus_message_append(m, "s", argv[0]);
         if (r < 0)
 
         r = sd_bus_message_append(m, "s", argv[0]);
         if (r < 0)

-                return r;
+                return bus_log_create_error(r);

 
         r = sd_bus_message_append_strv(m, argv);
         if (r < 0)
 
         r = sd_bus_message_append_strv(m, argv);
         if (r < 0)

-                return r;
+                return bus_log_create_error(r);

 
         r = sd_bus_message_append(m, "b", false);
         if (r < 0)
 
         r = sd_bus_message_append(m, "b", false);
         if (r < 0)

-                return r;
+                return bus_log_create_error(r);

 
         r = sd_bus_message_close_container(m);
         if (r < 0)
 
         r = sd_bus_message_close_container(m);
         if (r < 0)

-                return r;
+                return bus_log_create_error(r);

 
         r = sd_bus_message_close_container(m);
         if (r < 0)
 
         r = sd_bus_message_close_container(m);
         if (r < 0)

-                return r;
+                return bus_log_create_error(r);

 
         r = sd_bus_message_close_container(m);
         if (r < 0)
 
         r = sd_bus_message_close_container(m);
         if (r < 0)

-                return r;
+                return bus_log_create_error(r);

 
         r = sd_bus_message_close_container(m);
         if (r < 0)
 
         r = sd_bus_message_close_container(m);
         if (r < 0)

-                return r;
+                return bus_log_create_error(r);

 
 

-        return message_start_transient_unit_send(bus, m, error, NULL);
+        r = message_start_transient_unit_send(bus, m, error, NULL);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        log_info("Running as unit %s.", name);
+
+        return 0;

 }
 
 static int start_transient_scope(
 }
 
 static int start_transient_scope(


@@ -461,6 +466,7 @@ static int start_transient_scope(
 
         _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
         _cleanup_free_ char *name = NULL;
 
         _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
         _cleanup_free_ char *name = NULL;

+        _cleanup_strv_free_ char **env = NULL, **user_env = NULL;

         int r;
 
         assert(bus);
         int r;
 
         assert(bus);


@@ -468,23 +474,91 @@ static int start_transient_scope(
         if (arg_unit)
                 name = unit_name_mangle_with_suffix(arg_unit, MANGLE_NOGLOB, ".scope");
         else
         if (arg_unit)
                 name = unit_name_mangle_with_suffix(arg_unit, MANGLE_NOGLOB, ".scope");
         else

-                asprintf(&name, "run-%lu.scope", (unsigned long) getpid());
+                asprintf(&name, "run-"PID_FMT".scope", getpid());

         if (!name)
         if (!name)

-                return -ENOMEM;
+                return log_oom();

 
         r = message_start_transient_unit_new(bus, name, &m);
         if (r < 0)
 
         r = message_start_transient_unit_new(bus, name, &m);
         if (r < 0)

-                return r;
+                return bus_log_create_error(r);

 
         r = sd_bus_message_append(m, "(sv)", "PIDs", "au", 1, (uint32_t) getpid());
         if (r < 0)
 
         r = sd_bus_message_append(m, "(sv)", "PIDs", "au", 1, (uint32_t) getpid());
         if (r < 0)

-                return r;
+                return bus_log_create_error(r);

 
         r = message_start_transient_unit_send(bus, m, error, NULL);
         if (r < 0)
 
         r = message_start_transient_unit_send(bus, m, error, NULL);
         if (r < 0)

-                return r;
+                return bus_log_create_error(r);

 
 

-        execvp(argv[0], argv);
+        if (arg_nice_set) {
+                if (setpriority(PRIO_PROCESS, 0, arg_nice) < 0) {
+                        log_error("Failed to set nice level: %m");
+                        return -errno;
+                }
+        }
+
+        if (arg_exec_group) {
+                gid_t gid;
+
+                r = get_group_creds(&arg_exec_group, &gid);
+                if (r < 0) {
+                        log_error("Failed to resolve group %s: %s", arg_exec_group, strerror(-r));
+                        return r;
+                }
+
+                if (setresgid(gid, gid, gid) < 0) {
+                        log_error("Failed to change GID to " GID_FMT ": %m", gid);
+                        return -errno;
+                }
+        }
+
+        if (arg_exec_user) {
+                const char *home, *shell;
+                uid_t uid;
+                gid_t gid;
+
+                r = get_user_creds(&arg_exec_user, &uid, &gid, &home, &shell);
+                if (r < 0) {
+                        log_error("Failed to resolve user %s: %s", arg_exec_user, strerror(-r));
+                        return r;
+                }
+
+                r = strv_extendf(&user_env, "HOME=%s", home);
+                if (r < 0)
+                        return log_oom();
+
+                r = strv_extendf(&user_env, "SHELL=%s", shell);
+                if (r < 0)
+                        return log_oom();
+
+                r = strv_extendf(&user_env, "USER=%s", arg_exec_user);
+                if (r < 0)
+                        return log_oom();
+
+                r = strv_extendf(&user_env, "LOGNAME=%s", arg_exec_user);
+                if (r < 0)
+                        return log_oom();
+
+                if (!arg_exec_group) {
+                        if (setresgid(gid, gid, gid) < 0) {
+                                log_error("Failed to change GID to " GID_FMT ": %m", gid);
+                                return -errno;
+                        }
+                }
+
+                if (setresuid(uid, uid, uid) < 0) {
+                        log_error("Failed to change UID to " UID_FMT ": %m", uid);
+                        return -errno;
+                }
+        }
+
+        env = strv_env_merge(3, environ, user_env, arg_environment);
+        if (!env)
+                return log_oom();
+
+        log_info("Running as unit %s.", name);
+
+        execvpe(argv[0], argv, env);

         log_error("Failed to execute: %m");
         return -errno;
 }
         log_error("Failed to execute: %m");
         return -errno;
 }


@@ -529,8 +603,6 @@ int main(int argc, char* argv[]) {
                 r = start_transient_scope(bus, argv + optind, &error);
         else
                 r = start_transient_service(bus, argv + optind, &error);
                 r = start_transient_scope(bus, argv + optind, &error);
         else
                 r = start_transient_service(bus, argv + optind, &error);

-        if (r < 0)
-                log_error("Failed start transient unit: %s", bus_error_message(&error, r));

 
 finish:
         strv_free(arg_environment);
 
 finish:
         strv_free(arg_environment);