X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Frun%2Frun.c;h=9d5527b29c6cf209b6e12ac7a0b4dc66d16a4327;hp=f9c6c292eab1684b95329c90598b81c8cd1eb488;hb=638ca89c53e2b897cfb3f627f4acbc7d09af2f4c;hpb=c7040b5d1c2c148f12b6a5eef3dfce1661805131 diff --git a/src/run/run.c b/src/run/run.c index f9c6c292e..9d5527b29 100644 --- 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 "env-util.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 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; @@ -45,27 +46,29 @@ static const char *arg_exec_group = NULL; static int arg_nice = 0; static bool arg_nice_set = false; static char **arg_environment = NULL; +static char **arg_property = NULL; static int help(void) { printf("%s [OPTIONS...] COMMAND [ARGS...]\n\n" "Run the specified command in a transient scope or service unit.\n\n" - " -h --help Show this help\n" - " --version Show package version\n" - " --user Run as user unit\n" - " -H --host=[USER@]HOST Operate on remote host\n" - " -M --machine=CONTAINER Operate on local container\n" - " --scope Run this as scope rather than service\n" - " --unit=UNIT Run under the specified unit name\n" - " --description=TEXT Description for unit\n" - " --slice=SLICE Run in the specified slice\n" - " -r --remain-after-exit Leave service around until explicitly stopped\n" - " --send-sighup Send SIGHUP when terminating\n" - " --service-type=TYPE Service type\n" - " --uid=USER Run as system user\n" - " --gid=GROUP Run as system group\n" - " --nice=NICE Nice level\n" - " --setenv=ENV Set environment\n", + " -h --help Show this help\n" + " --version Show package version\n" + " --user Run as user unit\n" + " -H --host=[USER@]HOST Operate on remote host\n" + " -M --machine=CONTAINER Operate on local container\n" + " --scope Run this as scope rather than service\n" + " --unit=UNIT Run under the specified unit name\n" + " -p --property=NAME=VALUE Set unit property\n" + " --description=TEXT Description for unit\n" + " --slice=SLICE Run in the specified slice\n" + " -r --remain-after-exit Leave service around until explicitly stopped\n" + " --send-sighup Send SIGHUP when terminating\n" + " --service-type=TYPE Service type\n" + " --uid=USER Run as system user\n" + " --gid=GROUP Run as system group\n" + " --nice=NICE Nice level\n" + " --setenv=NAME=VALUE Set environment\n", program_invocation_short_name); return 0; @@ -107,6 +110,7 @@ static int parse_argv(int argc, char *argv[]) { { "gid", required_argument, NULL, ARG_EXEC_GROUP }, { "nice", required_argument, NULL, ARG_NICE }, { "setenv", required_argument, NULL, ARG_SETENV }, + { "property", required_argument, NULL, 'p' }, {}, }; @@ -115,7 +119,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "+hrH:M:", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "+hrH:M:p:", options, NULL)) >= 0) { switch (c) { @@ -183,7 +187,7 @@ static int parse_argv(int argc, char *argv[]) { 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; } @@ -198,6 +202,13 @@ static int parse_argv(int argc, char *argv[]) { break; + case 'p': + + if (strv_extend(&arg_property, optarg) < 0) + return log_oom(); + + break; + case '?': return -EINVAL; @@ -221,8 +232,8 @@ static int parse_argv(int argc, char *argv[]) { 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; } @@ -231,20 +242,20 @@ static int parse_argv(int argc, char *argv[]) { static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bus_message **ret) { _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + char **i; int r; assert(bus); assert(name); assert(ret); - log_info("Running as unit %s.", name); - r = sd_bus_message_new_method_call( bus, + &m, "org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", - "StartTransientUnit", &m); + "StartTransientUnit"); if (r < 0) return r; @@ -256,6 +267,20 @@ static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bu if (r < 0) return r; + STRV_FOREACH(i, arg_property) { + r = sd_bus_message_open_container(m, 'r', "sv"); + if (r < 0) + return r; + + r = bus_append_unit_property_assignment(m, *i); + if (r < 0) + return r; + + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + } + r = sd_bus_message_append(m, "(sv)", "Description", "s", arg_description); if (r < 0) return r; @@ -272,9 +297,11 @@ static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bu return r; } - r = sd_bus_message_append(m, "(sv)", "SendSIGHUP", "b", arg_send_sighup); - if (r < 0) - return r; + if (arg_send_sighup) { + r = sd_bus_message_append(m, "(sv)", "SendSIGHUP", "b", arg_send_sighup); + if (r < 0) + return r; + } *ret = m; m = NULL; @@ -311,117 +338,125 @@ static int start_transient_service( 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) - return -ENOMEM; + return log_oom(); 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)", "RemainAfterExit", "b", arg_remain_after_exit); - if (r < 0) - return r; + if (arg_remain_after_exit) { + r = sd_bus_message_append(m, "(sv)", "RemainAfterExit", "b", arg_remain_after_exit); + if (r < 0) + 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) - 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) - 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) - 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) - 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) - return r; + return bus_log_create_error(r); 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) - return r; + return bus_log_create_error(r); 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) - return r; + return bus_log_create_error(r); 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) - return r; + return bus_log_create_error(r); 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) - return r; + return bus_log_create_error(r); 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) - return r; + return bus_log_create_error(r); 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) - return r; + return bus_log_create_error(r); 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) - return r; + return bus_log_create_error(r); 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) - return r; + return bus_log_create_error(r); r = sd_bus_message_close_container(m); if (r < 0) - return r; + return bus_log_create_error(r); + + r = message_start_transient_unit_send(bus, m, error, NULL); + if (r < 0) + return bus_log_create_error(r); - return message_start_transient_unit_send(bus, m, error, NULL); + log_info("Running as unit %s.", name); + + return 0; } static int start_transient_scope( @@ -431,6 +466,7 @@ static int start_transient_scope( _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); @@ -438,23 +474,91 @@ static int start_transient_scope( 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) - return -ENOMEM; + return log_oom(); 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) - return r; + return bus_log_create_error(r); r = message_start_transient_unit_send(bus, m, error, NULL); if (r < 0) - return r; + return bus_log_create_error(r); + + 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; + } + } - execvp(argv[0], argv); + 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; } @@ -489,7 +593,7 @@ int main(int argc, char* argv[]) { arg_description = description; } - r = bus_open_transport(arg_transport, arg_host, arg_user, &bus); + r = bus_open_transport_systemd(arg_transport, arg_host, arg_user, &bus); if (r < 0) { log_error("Failed to create bus connection: %s", strerror(-r)); goto finish; @@ -499,9 +603,10 @@ int main(int argc, char* argv[]) { 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); + strv_free(arg_property); + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }