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=b45116870c6dd10f7ed0785a2d60b7c09ba57a30;hb=638ca89c53e2b897cfb3f627f4acbc7d09af2f4c;hpb=6c12b52e19640747e96f89d85422941a23dc6b29 diff --git a/src/run/run.c b/src/run/run.c index b45116870..9d5527b29 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -23,25 +23,52 @@ #include #include "sd-bus.h" -#include "bus-internal.h" -#include "bus-message.h" +#include "bus-util.h" #include "strv.h" #include "build.h" #include "unit-name.h" +#include "env-util.h" +#include "path-util.h" +#include "bus-error.h" static bool arg_scope = false; -static bool arg_user = false; +static bool arg_remain_after_exit = false; static const char *arg_unit = NULL; +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_host = NULL; +static bool arg_user = false; +static const char *arg_service_type = NULL; +static const char *arg_exec_user = NULL; +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 LINE...]\n\n" - "Notify the init system about service status updates.\n\n" - " -h --help Show this help\n" - " --version Show package version\n" - " --user Run as user unit\n" - " --scope Run this as scope rather than service\n" - " --unit=UNIT Run under the specified unit name\n", + 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" + " -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; @@ -52,31 +79,52 @@ static int parse_argv(int argc, char *argv[]) { enum { ARG_VERSION = 0x100, ARG_USER, + ARG_SYSTEM, ARG_SCOPE, - ARG_UNIT + ARG_UNIT, + ARG_DESCRIPTION, + ARG_SLICE, + ARG_SEND_SIGHUP, + ARG_EXEC_USER, + ARG_EXEC_GROUP, + ARG_SERVICE_TYPE, + ARG_NICE, + ARG_SETENV }; static const struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "version", no_argument, NULL, ARG_VERSION }, - { "user", no_argument, NULL, ARG_USER }, - { "scope", no_argument, NULL, ARG_SCOPE }, - { "unit", required_argument, NULL, ARG_UNIT }, - { NULL, 0, NULL, 0 } + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, ARG_VERSION }, + { "user", no_argument, NULL, ARG_USER }, + { "system", no_argument, NULL, ARG_SYSTEM }, + { "scope", no_argument, NULL, ARG_SCOPE }, + { "unit", required_argument, NULL, ARG_UNIT }, + { "description", required_argument, NULL, ARG_DESCRIPTION }, + { "slice", required_argument, NULL, ARG_SLICE }, + { "remain-after-exit", no_argument, NULL, 'r' }, + { "send-sighup", no_argument, NULL, ARG_SEND_SIGHUP }, + { "host", required_argument, NULL, 'H' }, + { "machine", required_argument, NULL, 'M' }, + { "service-type", required_argument, NULL, ARG_SERVICE_TYPE }, + { "uid", required_argument, NULL, ARG_EXEC_USER }, + { "gid", required_argument, NULL, ARG_EXEC_GROUP }, + { "nice", required_argument, NULL, ARG_NICE }, + { "setenv", required_argument, NULL, ARG_SETENV }, + { "property", required_argument, NULL, 'p' }, + {}, }; - int c; + int r, c; assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "+h", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "+hrH:M:p:", options, NULL)) >= 0) { switch (c) { case 'h': - help(); - return 0; + return help(); case ARG_VERSION: puts(PACKAGE_STRING); @@ -87,6 +135,10 @@ static int parse_argv(int argc, char *argv[]) { arg_user = true; break; + case ARG_SYSTEM: + arg_user = false; + break; + case ARG_SCOPE: arg_scope = true; break; @@ -95,12 +147,73 @@ static int parse_argv(int argc, char *argv[]) { arg_unit = optarg; break; + case ARG_DESCRIPTION: + arg_description = optarg; + break; + + case ARG_SLICE: + arg_slice = optarg; + break; + + case ARG_SEND_SIGHUP: + arg_send_sighup = true; + break; + + case 'r': + arg_remain_after_exit = true; + break; + + case 'H': + arg_transport = BUS_TRANSPORT_REMOTE; + arg_host = optarg; + break; + + case 'M': + arg_transport = BUS_TRANSPORT_CONTAINER; + arg_host = optarg; + break; + + case ARG_SERVICE_TYPE: + arg_service_type = optarg; + break; + + case ARG_EXEC_USER: + arg_exec_user = optarg; + break; + + case ARG_EXEC_GROUP: + arg_exec_group = optarg; + break; + + case ARG_NICE: + r = safe_atoi(optarg, &arg_nice); + if (r < 0 || arg_nice < PRIO_MIN || arg_nice >= PRIO_MAX) { + log_error("Failed to parse nice value"); + return -EINVAL; + } + + arg_nice_set = true; + break; + + case ARG_SETENV: + + if (strv_extend(&arg_environment, optarg) < 0) + return log_oom(); + + break; + + case 'p': + + if (strv_extend(&arg_property, optarg) < 0) + return log_oom(); + + break; + case '?': return -EINVAL; default: - log_error("Unknown option code %c", c); - return -EINVAL; + assert_not_reached("Unhandled option"); } } @@ -109,21 +222,40 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; } + if (arg_user && arg_transport != BUS_TRANSPORT_LOCAL) { + log_error("Execution in user context is not supported on non-local systems."); + return -EINVAL; + } + + if (arg_scope && arg_transport != BUS_TRANSPORT_LOCAL) { + log_error("Scope execution is not supported on non-local systems."); + return -EINVAL; + } + + 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 1; } 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; - log_info("Running as unit %s.", name); + assert(bus); + assert(name); + assert(ret); 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; @@ -135,10 +267,42 @@ static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bu if (r < 0) return r; - r = sd_bus_message_open_container(m, 'r', "sv"); + 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; + if (!isempty(arg_slice)) { + _cleanup_free_ char *slice; + + slice = unit_name_mangle_with_suffix(arg_slice, MANGLE_NOGLOB, ".slice"); + if (!slice) + return -ENOMEM; + + r = sd_bus_message_append(m, "(sv)", "Slice", "s", slice); + 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; @@ -148,15 +312,18 @@ static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bu static int message_start_transient_unit_send(sd_bus *bus, sd_bus_message *m, sd_bus_error *error, sd_bus_message **reply) { int r; + assert(bus); + assert(m); + r = sd_bus_message_close_container(m); if (r < 0) return r; - r = sd_bus_message_close_container(m); + r = sd_bus_message_append(m, "a(sa(sv))", 0); if (r < 0) return r; - return sd_bus_send_with_reply_and_block(bus, m, 0, error, reply); + return sd_bus_call(bus, m, 0, error, reply); } static int start_transient_service( @@ -164,73 +331,132 @@ static int start_transient_service( char **argv, sd_bus_error *error) { - _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL; + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; _cleanup_free_ char *name = NULL; - char **i; int r; if (arg_unit) - name = unit_name_mangle_with_suffix(arg_unit, ".service"); + 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); + + 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 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 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 bus_log_create_error(r); + } + + if (arg_nice_set) { + r = sd_bus_message_append(m, "(sv)", "Nice", "i", arg_nice); + if (r < 0) + return bus_log_create_error(r); + } + + if (!strv_isempty(arg_environment)) { + r = sd_bus_message_open_container(m, 'r', "sv"); + if (r < 0) + return bus_log_create_error(r); + + r = sd_bus_message_append(m, "s", "Environment"); + if (r < 0) + return bus_log_create_error(r); + + r = sd_bus_message_open_container(m, 'v', "as"); + if (r < 0) + return bus_log_create_error(r); + + r = sd_bus_message_append_strv(m, arg_environment); + if (r < 0) + return bus_log_create_error(r); + + r = sd_bus_message_close_container(m); + if (r < 0) + return bus_log_create_error(r); + + r = sd_bus_message_close_container(m); + if (r < 0) + return bus_log_create_error(r); + } + + r = sd_bus_message_open_container(m, 'r', "sv"); + if (r < 0) + 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_open_container(m, 'a', "s"); + r = sd_bus_message_append_strv(m, argv); if (r < 0) - return r; + return bus_log_create_error(r); - STRV_FOREACH(i, argv) { - r = sd_bus_message_append(m, "s", *i); - if (r < 0) - return r; - } + r = sd_bus_message_append(m, "b", false); + if (r < 0) + 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_append(m, "b", false); + 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); + r = message_start_transient_unit_send(bus, m, error, NULL); if (r < 0) - return r; + return bus_log_create_error(r); + + log_info("Running as unit %s.", name); - return message_start_transient_unit_send(bus, m, error, &reply); + return 0; } static int start_transient_scope( @@ -238,37 +464,109 @@ static int start_transient_scope( char **argv, sd_bus_error *error) { - _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = 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); + if (arg_unit) - name = unit_name_mangle_with_suffix(arg_unit, ".scope"); + 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()); + 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, &reply); + 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; + } + } + + 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(); - execvp(argv[0], argv); + 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; } int main(int argc, char* argv[]) { - sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_bus_unref_ sd_bus *bus = NULL; + _cleanup_free_ char *description = NULL, *command = NULL; int r; log_parse_environment(); @@ -276,27 +574,39 @@ int main(int argc, char* argv[]) { r = parse_argv(argc, argv); if (r <= 0) - goto fail; + goto finish; - if (arg_user) - r = sd_bus_open_user(&bus); - else - r = sd_bus_open_system(&bus); + r = find_binary(argv[optind], &command); if (r < 0) { - log_error("Failed to create new bus connection: %s", strerror(-r)); - goto fail; + log_error("Failed to find executable %s: %s", argv[optind], strerror(-r)); + goto finish; + } + argv[optind] = command; + + if (!arg_description) { + description = strv_join(argv + optind, " "); + if (!description) { + r = log_oom(); + goto finish; + } + + arg_description = description; + } + + 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; } if (arg_scope) 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", error.message); - sd_bus_error_free(&error); - goto fail; - } -fail: +finish: + strv_free(arg_environment); + strv_free(arg_property); + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }