X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Floginctl.c;h=186959e9c2322c17e5b2e87f35a55fc2f8375bde;hp=cf4ca46631c629f2fdc0a37793a6a9ef481e3089;hb=68453974ade693ca39fb2c6f08dd88f25d28777c;hpb=1b99ea27bc3ffa1fc6f7cfe89563d891a9aed4c5 diff --git a/src/login/loginctl.c b/src/login/loginctl.c index cf4ca4663..186959e9c 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -19,32 +19,40 @@ along with systemd; If not, see . ***/ -#include #include -#include #include #include +#include +#include #include "sd-bus.h" -#include "sd-login.h" -#include "bus-util.h" + +#include "alloc-util.h" #include "bus-error.h" +#include "bus-util.h" +//#include "cgroup-show.h" +#include "cgroup-util.h" #include "log.h" -#include "util.h" +//#include "logs-show.h" #include "macro.h" #include "pager.h" -#include "build.h" +#include "parse-util.h" +#include "process-util.h" +#include "signal-util.h" +#include "spawn-polkit-agent.h" #include "strv.h" -#include "unit-name.h" #include "sysfs-show.h" -// #include "logs-show.h" -#include "cgroup-show.h" -#include "cgroup-util.h" -#include "spawn-polkit-agent.h" -#include "verbs.h" -#include "process-util.h" #include "terminal-util.h" -#include "signal-util.h" +#include "unit-name.h" +#include "user-util.h" +#include "util.h" +#include "verbs.h" + +/// Additional includes for elogind +#include "logind-action.h" +#include "musl_missing.h" +#include "sd-login.h" +#include "virt.h" static char **arg_property = NULL; static bool arg_all = false; @@ -56,10 +64,22 @@ static int arg_signal = SIGTERM; static BusTransport arg_transport = BUS_TRANSPORT_LOCAL; static char *arg_host = NULL; static bool arg_ask_password = true; +static bool arg_ignore_inhibitors = false; #if 0 static unsigned arg_lines = 10; static OutputMode arg_output = OUTPUT_SHORT; #endif // 0 +static enum action { + _ACTION_INVALID, + ACTION_POWEROFF, + ACTION_REBOOT, + ACTION_SUSPEND, + ACTION_HIBERNATE, + ACTION_HYBRID_SLEEP, + ACTION_CANCEL_SHUTDOWN, + _ACTION_MAX +} arg_action; + static void pager_open_if_enabled(void) { @@ -82,6 +102,7 @@ static void polkit_agent_open_if_enabled(void) { polkit_agent_open(); } +#if 0 /// UNNEEDED by elogind static OutputFlags get_output_flags(void) { return @@ -90,6 +111,7 @@ static OutputFlags get_output_flags(void) { (!on_tty() || pager_have()) * OUTPUT_FULL_WIDTH | on_tty() * OUTPUT_COLOR; } +#endif // 0 static int list_sessions(int argc, char *argv[], void *userdata) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; @@ -231,6 +253,7 @@ static int list_seats(int argc, char *argv[], void *userdata) { return 0; } +#if 0 /// UNNEEDED by elogind static int show_unit_cgroup(sd_bus *bus, const char *interface, const char *unit, pid_t leader) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; @@ -266,7 +289,7 @@ static int show_unit_cgroup(sd_bus *bus, const char *interface, const char *unit if (isempty(cgroup)) return 0; - if (cg_is_empty_recursive(ELOGIND_CGROUP_CONTROLLER, cgroup, false) != 0 && leader <= 0) + if (cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, cgroup) != 0 && leader <= 0) return 0; c = columns(); @@ -275,9 +298,10 @@ static int show_unit_cgroup(sd_bus *bus, const char *interface, const char *unit else c = 0; - show_cgroup_and_extra(ELOGIND_CGROUP_CONTROLLER, cgroup, "\t\t ", c, false, &leader, leader > 0, get_output_flags()); + show_cgroup_and_extra(SYSTEMD_CGROUP_CONTROLLER, cgroup, "\t\t ", c, false, &leader, leader > 0, get_output_flags()); return 0; } +#endif // 0 typedef struct SessionStatusInfo { char *id; @@ -534,8 +558,8 @@ static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li if (i.scope) { printf("\t Unit: %s\n", i.scope); - show_unit_cgroup(bus, "org.freedesktop.systemd1.Scope", i.scope, i.leader); #if 0 + show_unit_cgroup(bus, "org.freedesktop.systemd1.Scope", i.scope, i.leader); if (arg_transport == BUS_TRANSPORT_LOCAL) { show_journal_by_unit( @@ -618,8 +642,8 @@ static int print_user_status_info(sd_bus *bus, const char *path, bool *new_line) if (i.slice) { printf("\t Unit: %s\n", i.slice); - show_unit_cgroup(bus, "org.freedesktop.systemd1.Slice", i.slice, 0); #if 0 + show_unit_cgroup(bus, "org.freedesktop.systemd1.Slice", i.slice, 0); show_journal_by_unit( stdout, i.slice, @@ -693,19 +717,165 @@ static int print_seat_status_info(sd_bus *bus, const char *path, bool *new_line) return 0; } +static int print_property(const char *name, sd_bus_message *m, const char *contents) { + int r; + + assert(name); + assert(m); + assert(contents); + + if (arg_property && !strv_find(arg_property, name)) + /* skip what we didn't read */ + return sd_bus_message_skip(m, contents); + + switch (contents[0]) { + + case SD_BUS_TYPE_STRUCT_BEGIN: + + if (contents[1] == SD_BUS_TYPE_STRING && STR_IN_SET(name, "Display", "Seat", "ActiveSession")) { + const char *s; + + r = sd_bus_message_read(m, "(so)", &s, NULL); + if (r < 0) + return bus_log_parse_error(r); + + if (arg_all || !isempty(s)) + printf("%s=%s\n", name, s); + + return 0; + + } else if (contents[1] == SD_BUS_TYPE_UINT32 && streq(name, "User")) { + uint32_t uid; + + r = sd_bus_message_read(m, "(uo)", &uid, NULL); + if (r < 0) + return bus_log_parse_error(r); + + if (!uid_is_valid(uid)) { + log_error("Invalid user ID: " UID_FMT, uid); + return -EINVAL; + } + + printf("%s=" UID_FMT "\n", name, uid); + + return 0; + } + + break; + + case SD_BUS_TYPE_ARRAY: + + if (contents[1] == SD_BUS_TYPE_STRUCT_BEGIN && streq(name, "Sessions")) { + const char *s; + bool space = false; + + r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, "(so)"); + if (r < 0) + return bus_log_parse_error(r); + + printf("%s=", name); + + while ((r = sd_bus_message_read(m, "(so)", &s, NULL)) > 0) { + printf("%s%s", space ? " " : "", s); + space = true; + } + + printf("\n"); + + if (r < 0) + return bus_log_parse_error(r); + + r = sd_bus_message_exit_container(m); + if (r < 0) + return bus_log_parse_error(r); + + return 0; + } + + break; + } + + r = bus_print_property(name, m, arg_all); + if (r < 0) + return bus_log_parse_error(r); + + if (r == 0) { + r = sd_bus_message_skip(m, contents); + if (r < 0) + return bus_log_parse_error(r); + + if (arg_all) + printf("%s=[unprintable]\n", name); + } + + return 0; +} + static int show_properties(sd_bus *bus, const char *path, bool *new_line) { + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; int r; + assert(bus); + assert(path); + assert(new_line); + + r = sd_bus_call_method( + bus, + "org.freedesktop.login1", + path, + "org.freedesktop.DBus.Properties", + "GetAll", + &error, + &reply, + "s", ""); + if (r < 0) + return log_error_errno(r, "Failed to get properties: %s", bus_error_message(&error, r)); + + r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "{sv}"); + if (r < 0) + return bus_log_parse_error(r); + if (*new_line) printf("\n"); *new_line = true; - r = bus_print_all_properties(bus, "org.freedesktop.login1", path, arg_property, arg_all); + while ((r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_DICT_ENTRY, "sv")) > 0) { + const char *name, *contents; + + r = sd_bus_message_read(reply, "s", &name); + if (r < 0) + return bus_log_parse_error(r); + + r = sd_bus_message_peek_type(reply, NULL, &contents); + if (r < 0) + return bus_log_parse_error(r); + + r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_VARIANT, contents); + if (r < 0) + return bus_log_parse_error(r); + + r = print_property(name, reply, contents); + if (r < 0) + return r; + + r = sd_bus_message_exit_container(reply); + if (r < 0) + return bus_log_parse_error(r); + + r = sd_bus_message_exit_container(reply); + if (r < 0) + return bus_log_parse_error(r); + } + if (r < 0) + return bus_log_parse_error(r); + + r = sd_bus_message_exit_container(reply); if (r < 0) - log_error_errno(r, "Could not get properties: %m"); + return bus_log_parse_error(r); - return r; + return 0; } static int show_session(int argc, char *argv[], void *userdata) { @@ -1185,7 +1355,111 @@ static int terminate_seat(int argc, char *argv[], void *userdata) { return 0; } -static int check_inhibitors(sd_bus *bus, const char *verb, const char *inhibit_what) { +/* Ask elogind, which might grant access to unprivileged users + * through PolicyKit */ +static int reboot_with_logind(sd_bus *bus, enum action a) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + const char *method; + int r; + static const char *table[_ACTION_MAX] = { + [ACTION_REBOOT] = "The system is going down for reboot NOW!", + [ACTION_POWEROFF] = "The system is going down for power-off NOW!", + [ACTION_CANCEL_SHUTDOWN] = "The system shutdown has been cancelled NOW!" + }; + + if (!bus) + return -EIO; + + polkit_agent_open_if_enabled(); + + switch (a) { + + case ACTION_POWEROFF: + method = "PowerOff"; + break; + + case ACTION_REBOOT: + method = "Reboot"; + break; + + case ACTION_SUSPEND: + method = "Suspend"; + break; + + case ACTION_HIBERNATE: + method = "Hibernate"; + break; + + case ACTION_HYBRID_SLEEP: + method = "HybridSleep"; + break; + + case ACTION_CANCEL_SHUTDOWN: + method = "CancelScheduledShutdown"; + break; + + default: + return -EINVAL; + } + + if (table[a]) { + r = sd_bus_call_method( + bus, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + "SetWallMessage", + &error, + NULL, + "sb", + table[a], + true); + + if (r < 0) { + log_warning_errno(r, "Failed to set wall message, ignoring: %s", + bus_error_message(&error, r)); + sd_bus_error_free(&error); + } + } + + + r = sd_bus_call_method( + bus, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + method, + &error, + NULL, + "b", arg_ask_password); + if (r < 0) + log_error("Failed to execute operation: %s", bus_error_message(&error, r)); + + return r; +} + +static const struct { + HandleAction action; + const char* verb; +} action_table[_ACTION_MAX] = { + [ACTION_POWEROFF] = { HANDLE_POWEROFF, "poweroff", }, + [ACTION_REBOOT] = { HANDLE_REBOOT, "reboot", }, + [ACTION_SUSPEND] = { HANDLE_SUSPEND, "suspend", }, + [ACTION_HIBERNATE] = { HANDLE_HIBERNATE, "hibernate", }, + [ACTION_HYBRID_SLEEP] = { HANDLE_HYBRID_SLEEP, "hybrid-sleep" }, +}; + +static enum action verb_to_action(const char *verb) { + enum action i; + + for (i = _ACTION_INVALID; i < _ACTION_MAX; i++) + if (streq_ptr(action_table[i].verb, verb)) + return i; + + return _ACTION_INVALID; +} + +static int check_inhibitors(sd_bus *bus, enum action a) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; _cleanup_strv_free_ char **sessions = NULL; const char *what, *who, *why, *mode; @@ -1194,7 +1468,11 @@ static int check_inhibitors(sd_bus *bus, const char *verb, const char *inhibit_w char **s; int r; - assert(bus); + if (!bus) + return 0; + + if (arg_ignore_inhibitors) + return 0; if (geteuid() == 0) return 0; @@ -1230,14 +1508,19 @@ static int check_inhibitors(sd_bus *bus, const char *verb, const char *inhibit_w if (!sv) return log_oom(); - if (!strv_contains(sv, inhibit_what)) + if ((pid_t) pid < 0) + return log_error_errno(ERANGE, "Bad PID %"PRIu32": %m", pid); + + if (!strv_contains(sv, + a == ACTION_POWEROFF || + a == ACTION_REBOOT ? "shutdown" : "sleep")) continue; get_process_comm(pid, &comm); user = uid_to_name(uid); log_warning("Operation inhibited by \"%s\" (PID "PID_FMT" \"%s\", user %s), reason is \"%s\".", - who, pid, strna(comm), strna(user), why); + who, (pid_t) pid, strna(comm), strna(user), why); c++; } @@ -1274,154 +1557,50 @@ static int check_inhibitors(sd_bus *bus, const char *verb, const char *inhibit_w if (c <= 0) return 0; - log_error("Please retry operation after closing inhibitors and logging out other users.\nAlternatively, ignore inhibitors and users with 'loginctl %s -i'.", verb); + log_error("Please retry operation after closing inhibitors and logging out other users.\n" + "Alternatively, ignore inhibitors and users with 'loginctl %s -i'.", + action_table[a].verb); return -EPERM; } -static int poweroff(int argc, char *argv[], void *userdata) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; +static int start_special(int argc, char *argv[], void *userdata) { sd_bus *bus = userdata; + enum action a; int r; - assert(bus); - - r = check_inhibitors(bus, "poweroff", "shutdown"); - if (r < 0) - return r; - - polkit_agent_open_if_enabled(); - - r = sd_bus_call_method( - bus, - "org.freedesktop.login1", - "/org/freedesktop/login1", - "org.freedesktop.login1.Manager", - "PowerOff", - &error, - NULL, - "b", arg_ask_password); - if (r < 0) - log_error("Failed to power off: %s", bus_error_message(&error, r)); - - return r; -} - -static int reboot(int argc, char *argv[], void *userdata) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - sd_bus *bus = userdata; - int r; - - assert(bus); - - r = check_inhibitors(bus, "reboot", "shutdown"); - if (r < 0) - return r; - - polkit_agent_open_if_enabled(); - - r = sd_bus_call_method( - bus, - "org.freedesktop.login1", - "/org/freedesktop/login1", - "org.freedesktop.login1.Manager", - "Reboot", - &error, - NULL, - "b", arg_ask_password); - if (r < 0) - log_error("Failed to reboot: %s", bus_error_message(&error, r)); - - return r; -} - -static int suspend(int argc, char *argv[], void *userdata) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - sd_bus *bus = userdata; - int r; - - assert(bus); - - r = check_inhibitors(bus, "suspend", "sleep"); - if (r < 0) - return r; - - polkit_agent_open_if_enabled(); - - r = sd_bus_call_method( - bus, - "org.freedesktop.login1", - "/org/freedesktop/login1", - "org.freedesktop.login1.Manager", - "Suspend", - &error, - NULL, - "b", arg_ask_password); - if (r < 0) - log_error("Failed to suspend: %s", bus_error_message(&error, r)); - - return r; -} - -static int hibernate(int argc, char *argv[], void *userdata) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - sd_bus *bus = userdata; - int r; - - assert(bus); - - r = check_inhibitors(bus, "hibernate", "sleep"); - if (r < 0) - return r; - - polkit_agent_open_if_enabled(); - - r = sd_bus_call_method( - bus, - "org.freedesktop.login1", - "/org/freedesktop/login1", - "org.freedesktop.login1.Manager", - "Hibernate", - &error, - NULL, - "b", arg_ask_password); - if (r < 0) - log_error("Failed to hibernate: %s", bus_error_message(&error, r)); - - return r; -} - -static int hybrid_sleep(int argc, char *argv[], void *userdata) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - sd_bus *bus = userdata; - int r; + assert(argv); - assert(bus); + a = verb_to_action(argv[0]); - r = check_inhibitors(bus, "hybrid-sleep", "sleep"); + r = check_inhibitors(bus, a); if (r < 0) return r; - polkit_agent_open_if_enabled(); - - r = sd_bus_call_method( - bus, - "org.freedesktop.login1", - "/org/freedesktop/login1", - "org.freedesktop.login1.Manager", - "HybridSleep", - &error, - NULL, - "b", arg_ask_password); - if (r < 0) - log_error("Failed to hybrid sleep: %s", bus_error_message(&error, r)); + /* Now power off actions in chroot environments */ + if ((a == ACTION_POWEROFF || + a == ACTION_REBOOT) && + (running_in_chroot() > 0) ) { + log_info("Running in chroot, ignoring request."); + return 0; + } - return r; + /* Switch to cancel shutdown, if a shutdown action was requested, + and the option to cancel it was set: */ + if ((a == ACTION_POWEROFF || + a == ACTION_REBOOT) && + (arg_action == ACTION_CANCEL_SHUTDOWN)) + return reboot_with_logind(bus, arg_action); + + /* Otherwise perform requested action */ + if (a == ACTION_POWEROFF || + a == ACTION_REBOOT || + a == ACTION_SUSPEND || + a == ACTION_HIBERNATE || + a == ACTION_HYBRID_SLEEP) + return reboot_with_logind(bus, a); + + return -EOPNOTSUPP; } static int help(int argc, char *argv[], void *userdata) { @@ -1445,6 +1624,8 @@ static int help(int argc, char *argv[], void *userdata) { " -o --output=STRING Change journal output mode (short, short-monotonic,\n" " verbose, export, json, json-pretty, json-sse, cat)\n\n" #endif // 0 + " -c Cancel a pending shutdown\n" + " -i --ignore-inhibitors When shutting down or sleeping, ignore inhibitors\n" "Session Commands:\n" " list-sessions List sessions\n" " session-status [ID...] Show session status\n" @@ -1508,7 +1689,8 @@ static int parse_argv(int argc, char *argv[]) { #if 0 { "lines", required_argument, NULL, 'n' }, { "output", required_argument, NULL, 'o' }, -#endif // +#endif // 0 + { "ignore-inhibitors", no_argument, NULL, 'i' }, {} }; @@ -1517,7 +1699,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "hp:als:H:M:", options, NULL)) >= 0) + while ((c = getopt_long(argc, argv, "hp:als:H:M:n:o:ci", options, NULL)) >= 0) switch (c) { @@ -1526,9 +1708,7 @@ static int parse_argv(int argc, char *argv[]) { return 0; case ARG_VERSION: - puts(PACKAGE_STRING); - puts(SYSTEMD_FEATURES); - return 0; + return version(); case 'p': { r = strv_extend(&arg_property, optarg); @@ -1599,6 +1779,14 @@ static int parse_argv(int argc, char *argv[]) { arg_host = optarg; break; + case 'c': + arg_action = ACTION_CANCEL_SHUTDOWN; + break; + + case 'i': + arg_ignore_inhibitors = true; + break; + case '?': return -EINVAL; @@ -1636,11 +1824,12 @@ static int loginctl_main(int argc, char *argv[], sd_bus *bus) { { "attach", 3, VERB_ANY, 0, attach }, { "flush-devices", VERB_ANY, 1, 0, flush_devices }, { "terminate-seat", 2, VERB_ANY, 0, terminate_seat }, - { "poweroff", VERB_ANY, 1, 0, poweroff }, - { "reboot", VERB_ANY, 1, 0, reboot }, - { "suspend", VERB_ANY, 1, 0, suspend }, - { "hibernate", VERB_ANY, 1, 0, hibernate }, - { "hybrid-sleep", VERB_ANY, 1, 0, hybrid_sleep }, + { "poweroff", VERB_ANY, 1, 0, start_special }, + { "reboot", VERB_ANY, 1, 0, start_special }, + { "suspend", VERB_ANY, 1, 0, start_special }, + { "hibernate", VERB_ANY, 1, 0, start_special }, + { "hybrid-sleep", VERB_ANY, 1, 0, start_special }, + { "cancel-shutdown", VERB_ANY, 1, 0, start_special }, {} }; @@ -1652,6 +1841,7 @@ int main(int argc, char *argv[]) { int r; setlocale(LC_ALL, ""); + elogind_set_program_name(argv[0]); log_parse_environment(); log_open(); @@ -1659,7 +1849,7 @@ int main(int argc, char *argv[]) { if (r <= 0) goto finish; - r = bus_open_transport(arg_transport, arg_host, false, &bus); + r = bus_connect_transport(arg_transport, arg_host, false, &bus); if (r < 0) { log_error_errno(r, "Failed to create bus connection: %m"); goto finish;