From e8863150653931ae2ffc91757623f179ce763628 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Mon, 8 May 2023 23:10:07 +0800 Subject: [PATCH 1/2] core/manager: export manager_dbus_is_running --- src/core/manager.c | 8 ++++---- src/core/manager.h | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c index 36881de479..ec8851ca22 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1801,7 +1801,7 @@ static void manager_distribute_fds(Manager *m, FDSet *fds) { } } -static bool manager_dbus_is_running(Manager *m, bool deserialized) { +bool manager_dbus_is_running_full(Manager *m, bool deserialized) { Unit *u; assert(m); @@ -1843,7 +1843,7 @@ static void manager_setup_bus(Manager *m) { (void) bus_init_system(m); /* Let's connect to the bus now, but only if the unit is supposed to be up */ - if (manager_dbus_is_running(m, MANAGER_IS_RELOADING(m))) { + if (manager_dbus_is_running_full(m, MANAGER_IS_RELOADING(m))) { (void) bus_init_api(m); if (MANAGER_IS_SYSTEM(m)) @@ -2935,7 +2935,7 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t break; case SIGUSR1: - if (manager_dbus_is_running(m, false)) { + if (manager_dbus_is_running(m)) { log_info("Trying to reconnect to bus..."); (void) bus_init_api(m); @@ -4140,7 +4140,7 @@ void manager_recheck_dbus(Manager *m) { if (MANAGER_IS_RELOADING(m)) return; /* don't check while we are reloading… */ - if (manager_dbus_is_running(m, false)) { + if (manager_dbus_is_running(m)) { (void) bus_init_api(m); if (MANAGER_IS_SYSTEM(m)) diff --git a/src/core/manager.h b/src/core/manager.h index 486eda11b6..951d46222e 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -504,6 +504,11 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free); int manager_startup(Manager *m, FILE *serialization, FDSet *fds, const char *root); +bool manager_dbus_is_running_full(Manager *m, bool deserialized); +static inline bool manager_dbus_is_running(Manager *m) { + return manager_dbus_is_running_full(m, false); +} + Job *manager_get_job(Manager *m, uint32_t id); Unit *manager_get_unit(Manager *m, const char *name); From 53964fd26b4a01191609ffc064aa8ccccd28e377 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Tue, 9 May 2023 00:07:45 +0800 Subject: [PATCH 2/2] core: refuse dbus activation if dbus is not running dbus-broker issues StartUnit directly for activation requests, so let's add a check on bus state in bus_unit_queue_job to refuse that if dbus is not running. Replaces #27570 Closes #26799 --- src/core/dbus-unit.c | 7 +++++++ src/core/dbus.c | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index dd36cae860..5b89c76586 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -21,6 +21,7 @@ #include "path-util.h" #include "process-util.h" #include "selinux-access.h" +#include "service.h" #include "signal-util.h" #include "special.h" #include "string-table.h" @@ -1876,6 +1877,12 @@ int bus_unit_queue_job( (type == JOB_RELOAD_OR_START && job_type_collapse(type, u) == JOB_START && u->refuse_manual_start)) return sd_bus_error_setf(error, BUS_ERROR_ONLY_BY_DEPENDENCY, "Operation refused, unit %s may be requested by dependency only (it is configured to refuse manual start/stop).", u->id); + /* dbus-broker issues StartUnit for activation requests, so let's apply the same check + * used in signal_activation_request(). */ + if (type == JOB_START && u->type == UNIT_SERVICE && + SERVICE(u)->type == SERVICE_DBUS && !manager_dbus_is_running(u->manager)) + return sd_bus_error_set(error, BUS_ERROR_SHUTTING_DOWN, "Refusing activation, D-Bus is not running."); + r = sd_bus_message_new_method_return(message, &reply); if (r < 0) return r; diff --git a/src/core/dbus.c b/src/core/dbus.c index 9ce9ddc8f2..2f5feeaec3 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -160,9 +160,8 @@ static int signal_activation_request(sd_bus_message *message, void *userdata, sd return 0; } - if (manager_unit_inactive_or_pending(m, SPECIAL_DBUS_SERVICE) || - manager_unit_inactive_or_pending(m, SPECIAL_DBUS_SOCKET)) { - r = sd_bus_error_set(&error, BUS_ERROR_SHUTTING_DOWN, "Refusing activation, D-Bus is shutting down."); + if (!manager_dbus_is_running(m)) { + r = sd_bus_error_set(&error, BUS_ERROR_SHUTTING_DOWN, "Refusing activation, D-Bus is not running."); goto failed; }