X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemctl.c;h=15e5ecf437fbf2383c78da4076910063df8ac18e;hb=6e905d936021a31fe118e3806aec7db5bc34c77a;hp=ec92504f42f20dad2d83e4e3da3c77c1c5fb6b14;hpb=eb22ac37f3e07b9c49a3f8fdc8cc02631faabcb4;p=elogind.git diff --git a/src/systemctl.c b/src/systemctl.c index ec92504f4..15e5ecf43 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -29,6 +29,7 @@ #include #include #include +#include #include @@ -39,12 +40,13 @@ #include "utmp-wtmp.h" #include "special.h" #include "initreq.h" +#include "strv.h" static const char *arg_type = NULL; static bool arg_all = false; static bool arg_replace = false; static bool arg_session = false; -static bool arg_block = false; +static bool arg_no_block = false; static bool arg_immediate = false; static bool arg_no_wtmp = false; static bool arg_no_sync = false; @@ -102,6 +104,32 @@ static int bus_iter_get_basic_and_next(DBusMessageIter *iter, int type, void *da return 0; } +static int bus_check_peercred(DBusConnection *c) { + int fd; + struct ucred ucred; + socklen_t l; + + assert(c); + + assert_se(dbus_connection_get_unix_fd(c, &fd)); + + l = sizeof(struct ucred); + if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &ucred, &l) < 0) { + log_error("SO_PEERCRED failed: %m"); + return -errno; + } + + if (l != sizeof(struct ucred)) { + log_error("SO_PEERCRED returned wrong size."); + return -E2BIG; + } + + if (ucred.uid != 0) + return -EPERM; + + return 1; +} + static int columns(void) { static int parsed_columns = 0; const char *e; @@ -139,6 +167,23 @@ static void warn_wall(enum action action) { if (arg_no_wall) return; + if (arg_wall) { + char *p; + + if (!(p = strv_join(arg_wall, " "))) { + log_error("Failed to join strings."); + return; + } + + if (*p) { + utmp_wall(p); + free(p); + return; + } + + free(p); + } + if (!table[action]) return; @@ -618,7 +663,7 @@ static int start_unit_one( assert(method); assert(name); assert(mode); - assert(!arg_block || s); + assert(arg_no_block || s); dbus_error_init(&error); @@ -655,7 +700,7 @@ static int start_unit_one( goto finish; } - if (arg_block) { + if (!arg_no_block) { const char *path; char *p; @@ -761,7 +806,7 @@ static int start_unit(DBusConnection *bus, char **args, unsigned n) { one_name = table[arg_action]; } - if (arg_block) { + if (!arg_no_block) { if ((r = enable_wait_for_jobs(bus)) < 0) { log_error("Could not watch jobs: %s", strerror(-r)); goto finish; @@ -785,7 +830,7 @@ static int start_unit(DBusConnection *bus, char **args, unsigned n) { goto finish; } - if (arg_block) + if (!arg_no_block) r = wait_for_jobs(bus, s); finish: @@ -1383,16 +1428,16 @@ finish: static int systemctl_help(void) { - printf("%s [options]\n\n" - "Send control commands to the init daemon.\n\n" + printf("%s [OPTIONS...] {COMMAND} ...\n\n" + "Send control commands to the systemd manager.\n\n" " -h --help Show this help\n" " -t --type=TYPE List only units of a particular type\n" " -a --all Show all units, including dead ones\n" " --replace When installing a new job, replace existing conflicting ones\n" " --system Connect to system bus\n" " --session Connect to session bus\n" - " --block Wait until operation finished\n" - " --no-wall Don't send wall message before reboot/halt/power-off\n\n" + " --no-block Do not wait until operation finished\n" + " --no-wall Don't send wall message before halt/power-off/reboot\n\n" "Commands:\n" " list-units List units\n" " list-jobs List jobs\n" @@ -1407,15 +1452,15 @@ static int systemctl_help(void) { " monitor Monitor unit/job changes\n" " dump Dump server status\n" " snapshot [NAME] Create a snapshot\n" - " daemon-reload Reload init daemon configuration\n" - " daemon-reexecute Reexecute init daemon\n" - " daemon-exit Ask the init daemon to quit\n" + " daemon-reload Reload systemd manager configuration\n" + " daemon-reexec Reexecute systemd manager\n" + " daemon-exit Ask the systemd manager to quit\n" " show-environment Dump environment\n" " set-environment [NAME=VALUE...] Set one or more environment variables\n" " unset-environment [NAME...] Unset one or more environment variables\n" " halt Shut down and halt the system\n" + " poweroff Shut down and power-off the system\n" " reboot Shut down and reboot the system\n" - " poweroff Shut down and power off the system\n" " default Enter default mode\n" " rescue Enter rescue mode\n" " emergency Enter emergency mode\n", @@ -1426,17 +1471,17 @@ static int systemctl_help(void) { static int halt_help(void) { - printf("%s [options]\n\n" + printf("%s [OPTIONS...]\n\n" "%s the system.\n\n" " --help Show this help\n" " --halt Halt the machine\n" " -p --poweroff Switch off the machine\n" " --reboot Reboot the machine\n" - " -f --force Force immediate reboot/halt/power-off\n" - " -w --wtmp-only Don't reboot/halt/power-off, just write wtmp record\n" + " -f --force Force immediate halt/power-off/reboot\n" + " -w --wtmp-only Don't halt/power-off/reboot, just write wtmp record\n" " -d --no-wtmp Don't write wtmp record\n" - " -n --no-sync Don't sync before reboot/halt/power-off\n" - " --no-wall Don't send wall message before reboot/halt/power-off\n", + " -n --no-sync Don't sync before halt/power-off/reboot\n" + " --no-wall Don't send wall message before halt/power-off/reboot\n", program_invocation_short_name, arg_action == ACTION_REBOOT ? "Reboot" : arg_action == ACTION_POWEROFF ? "Power off" : @@ -1447,15 +1492,15 @@ static int halt_help(void) { static int shutdown_help(void) { - printf("%s [options] [IGNORED] [WALL...]\n\n" + printf("%s [OPTIONS...] [now] [WALL...]\n\n" "Shut down the system.\n\n" " --help Show this help\n" " -H --halt Halt the machine\n" " -P --poweroff Power-off the machine\n" " -r --reboot Reboot the machine\n" " -h Equivalent to --poweroff, overriden by --halt\n" - " -k Don't reboot/halt/power-off, just send warnings\n" - " --no-wall Don't send wall message before reboot/halt/power-off\n", + " -k Don't halt/power-off/reboot, just send warnings\n" + " --no-wall Don't send wall message before halt/power-off/reboot\n", program_invocation_short_name); return 0; @@ -1463,10 +1508,10 @@ static int shutdown_help(void) { static int telinit_help(void) { - printf("%s [options]\n\n" + printf("%s [OPTIONS...] {COMMAND}\n\n" "Send control commands to the init daemon.\n\n" " --help Show this help\n" - " --no-wall Don't send wall message before reboot/halt/power-off\n\n" + " --no-wall Don't send wall message before halt/power-off/reboot\n\n" "Commands:\n" " 0 Power-off the machine\n" " 6 Reboot the machine\n" @@ -1481,7 +1526,7 @@ static int telinit_help(void) { static int runlevel_help(void) { - printf("%s [options]\n\n" + printf("%s [OPTIONS...]\n\n" "Prints the previous and current runlevel of the init system.\n\n" " --help Show this help\n", program_invocation_short_name); @@ -1495,20 +1540,20 @@ static int systemctl_parse_argv(int argc, char *argv[]) { ARG_REPLACE = 0x100, ARG_SESSION, ARG_SYSTEM, - ARG_BLOCK, + ARG_NO_BLOCK, ARG_NO_WALL }; static const struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "type", required_argument, NULL, 't' }, - { "all", no_argument, NULL, 'a' }, - { "replace", no_argument, NULL, ARG_REPLACE }, - { "session", no_argument, NULL, ARG_SESSION }, - { "system", no_argument, NULL, ARG_SYSTEM }, - { "block", no_argument, NULL, ARG_BLOCK }, - { "no-wall", no_argument, NULL, ARG_NO_WALL }, - { NULL, 0, NULL, 0 } + { "help", no_argument, NULL, 'h' }, + { "type", required_argument, NULL, 't' }, + { "all", no_argument, NULL, 'a' }, + { "replace", no_argument, NULL, ARG_REPLACE }, + { "session", no_argument, NULL, ARG_SESSION }, + { "system", no_argument, NULL, ARG_SYSTEM }, + { "no-block", no_argument, NULL, ARG_NO_BLOCK }, + { "no-wall", no_argument, NULL, ARG_NO_WALL }, + { NULL, 0, NULL, 0 } }; int c; @@ -1544,8 +1589,8 @@ static int systemctl_parse_argv(int argc, char *argv[]) { arg_session = false; break; - case ARG_BLOCK: - arg_block = true; + case ARG_NO_BLOCK: + arg_no_block = true; break; case ARG_NO_WALL: @@ -1723,6 +1768,9 @@ static int shutdown_parse_argv(int argc, char *argv[]) { } } + if (argc > optind && !streq(argv[optind], "now")) + log_warning("First argument '%s' isn't 'now'. Ignoring.", argv[optind]); + /* We ignore the time argument */ if (argc > optind + 1) arg_wall = argv + optind + 1; @@ -1730,7 +1778,6 @@ static int shutdown_parse_argv(int argc, char *argv[]) { optind = argc; return 1; - } static int telinit_parse_argv(int argc, char *argv[]) { @@ -1792,7 +1839,7 @@ static int telinit_parse_argv(int argc, char *argv[]) { } if (optind >= argc) { - log_error("Argument missing."); + telinit_help(); return -EINVAL; } @@ -1893,12 +1940,7 @@ static int parse_argv(int argc, char *argv[]) { return systemctl_parse_argv(argc, argv); } -static int talk_upstart(DBusConnection *bus) { - log_error("Talking upstart"); - return 0; -} - -static int talk_initctl(void) { +static int action_to_runlevel(void) { static const char table[_ACTION_MAX] = { [ACTION_HALT] = '0', @@ -1911,26 +1953,135 @@ static int talk_initctl(void) { [ACTION_RESCUE] = '1' }; + assert(arg_action < _ACTION_MAX); + + return table[arg_action]; +} + +static int talk_upstart(void) { + DBusMessage *m = NULL, *reply = NULL; + DBusError error; + int previous, rl, r; + char + env1_buf[] = "RUNLEVEL=X", + env2_buf[] = "PREVLEVEL=X"; + char *env1 = env1_buf, *env2 = env2_buf; + const char *emit = "runlevel"; + dbus_bool_t b_false = FALSE; + DBusMessageIter iter, sub; + DBusConnection *bus; + + dbus_error_init(&error); + + if (!(rl = action_to_runlevel())) + return 0; + + if (utmp_get_runlevel(&previous, NULL) < 0) + previous = 'N'; + + if (!(bus = dbus_connection_open("unix:abstract=/com/ubuntu/upstart", &error))) { + if (dbus_error_has_name(&error, DBUS_ERROR_NO_SERVER)) { + r = 0; + goto finish; + } + + log_error("Failed to connect to Upstart bus: %s", error.message); + r = -EIO; + goto finish; + } + + if ((r = bus_check_peercred(bus)) < 0) { + log_error("Failed to verify owner of bus."); + goto finish; + } + + if (!(m = dbus_message_new_method_call( + "com.ubuntu.Upstart", + "/com/ubuntu/Upstart", + "com.ubuntu.Upstart0_6", + "EmitEvent"))) { + + log_error("Could not allocate message."); + r = -ENOMEM; + goto finish; + } + + dbus_message_iter_init_append(m, &iter); + + env1_buf[sizeof(env1_buf)-2] = rl; + env2_buf[sizeof(env2_buf)-2] = previous; + + if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &emit) || + !dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &sub) || + !dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &env1) || + !dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &env2) || + !dbus_message_iter_close_container(&iter, &sub) || + !dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &b_false)) { + log_error("Could not append arguments to message."); + r = -ENOMEM; + goto finish; + } + + if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { + + if (error_is_no_service(&error)) { + r = 0; + goto finish; + } + + log_error("Failed to issue method call: %s", error.message); + r = -EIO; + goto finish; + } + + r = 1; + +finish: + if (m) + dbus_message_unref(m); + + if (reply) + dbus_message_unref(reply); + + if (bus) + dbus_connection_unref(bus); + + dbus_error_free(&error); + + return r; +} + +static int talk_initctl(void) { struct init_request request; int r, fd; + char rl; - if (!table[arg_action]) + if (!(rl = action_to_runlevel())) return 0; zero(request); request.magic = INIT_MAGIC; request.sleeptime = 0; request.cmd = INIT_CMD_RUNLVL; - request.runlevel = table[arg_action]; + request.runlevel = rl; + + if ((fd = open(INIT_FIFO, O_WRONLY|O_NDELAY|O_CLOEXEC|O_NOCTTY)) < 0) { + + if (errno == ENOENT) + return 0; - if ((fd = open(INIT_FIFO, O_WRONLY|O_NDELAY|O_CLOEXEC|O_NOCTTY)) < 0) + log_error("Failed to open "INIT_FIFO": %m"); return -errno; + } + errno = 0; r = loop_write(fd, &request, sizeof(request), false) != sizeof(request); close_nointr_nofail(fd); - if (r < 0) + if (r < 0) { + log_error("Failed to write to "INIT_FIFO": %m"); return errno ? -errno : -EIO; + } return 1; } @@ -2062,13 +2213,17 @@ static int start_with_fallback(DBusConnection *bus) { /* Hmm, talking to systemd via D-Bus didn't work. Then * let's try to talk to Upstart via D-Bus. */ - if ((r = talk_upstart(bus)) > 0) + if ((r = talk_upstart()) > 0) return 0; } /* Nothing else worked, so let's try * /dev/initctl */ - return talk_initctl(); + if ((r = talk_initctl()) != 0) + return 0; + + log_error("Failed to talk to init daemon."); + return -EIO; } static int halt_main(DBusConnection *bus) { @@ -2154,7 +2309,18 @@ int main(int argc, char*argv[]) { goto finish; } - if ((bus = dbus_bus_get(arg_session ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &error))) + /* If we are root, then let's not go via the bus */ + if (geteuid() == 0 && !arg_session) { + bus = dbus_connection_open("unix:abstract=/org/freedesktop/systemd1/private", &error); + + if (bus && bus_check_peercred(bus) < 0) { + log_error("Failed to verify owner of bus."); + goto finish; + } + } else + bus = dbus_bus_get(arg_session ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &error); + + if (bus) dbus_connection_set_exit_on_disconnect(bus, FALSE); switch (arg_action) {