Skip to content

Commit

Permalink
core: refuse dbus activation if dbus is not running
Browse files Browse the repository at this point in the history
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 systemd#27570
Closes systemd#26799
  • Loading branch information
YHNdnzj committed May 8, 2023
1 parent fca8ef5 commit 1d35964
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
7 changes: 7 additions & 0 deletions src/core/dbus-unit.c
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions src/core/dbus.c
Expand Up @@ -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;
}

Expand Down

0 comments on commit 1d35964

Please sign in to comment.