X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus.c;h=b02cf34e5dce65a3cb9615d22d43991613081a32;hb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;hp=be8dfc90f859eed8d488816473310b22081f0942;hpb=8f8f05a919355095518911135c3d630f4620a9b0;p=elogind.git diff --git a/src/core/dbus.c b/src/core/dbus.c index be8dfc90f..b02cf34e5 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -64,7 +64,7 @@ int bus_send_queued_message(Manager *m) { r = sd_bus_send(m->queued_message_bus, m->queued_message, NULL); if (r < 0) - log_warning("Failed to send queued message: %s", strerror(-r)); + log_warning_errno(-r, "Failed to send queued message: %m"); m->queued_message = sd_bus_message_unref(m->queued_message); m->queued_message_bus = sd_bus_unref(m->queued_message_bus); @@ -95,7 +95,7 @@ static int signal_agent_released(sd_bus *bus, sd_bus_message *message, void *use r = sd_bus_send(m->system_bus, message, NULL); if (r < 0) - log_warning("Failed to forward Released message: %s", strerror(-r)); + log_warning_errno(-r, "Failed to forward Released message: %m"); } return 0; @@ -203,7 +203,7 @@ failed: r = sd_bus_send_to(bus, reply, "org.freedesktop.DBus", NULL); if (r < 0) { - log_error("Failed to respond with to bus activation request: %s", strerror(-r)); + log_error_errno(-r, "Failed to respond with to bus activation request: %m"); return r; } @@ -211,7 +211,7 @@ failed: } #ifdef HAVE_SELINUX -static int selinux_filter(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int mac_selinux_filter(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; const char *verb, *path; Unit *u = NULL; @@ -239,7 +239,7 @@ static int selinux_filter(sd_bus *bus, sd_bus_message *message, void *userdata, if (object_path_startswith("/org/freedesktop/systemd1", path)) { - r = selinux_access_check(bus, message, verb, error); + r = mac_selinux_access_check(message, verb, error); if (r < 0) return r; @@ -270,7 +270,7 @@ static int selinux_filter(sd_bus *bus, sd_bus_message *message, void *userdata, if (!u) return 0; - r = selinux_unit_access_check(u, bus, message, verb, error); + r = mac_selinux_unit_access_check(u, message, verb, error); if (r < 0) return r; @@ -310,7 +310,7 @@ static int find_unit(Manager *m, sd_bus *bus, const char *path, Unit **unit, sd_ sd_bus_message *message; pid_t pid; - message = sd_bus_get_current(bus); + message = sd_bus_get_current_message(bus); if (!message) return 0; @@ -536,76 +536,76 @@ static int bus_setup_api_vtables(Manager *m, sd_bus *bus) { assert(bus); #ifdef HAVE_SELINUX - r = sd_bus_add_filter(bus, selinux_filter, m); + r = sd_bus_add_filter(bus, NULL, mac_selinux_filter, m); if (r < 0) { - log_error("Failed to add SELinux access filter: %s", strerror(-r)); + log_error_errno(-r, "Failed to add SELinux access filter: %m"); return r; } #endif - r = sd_bus_add_object_vtable(bus, "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", bus_manager_vtable, m); + r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", bus_manager_vtable, m); if (r < 0) { - log_error("Failed to register Manager vtable: %s", strerror(-r)); + log_error_errno(-r, "Failed to register Manager vtable: %m"); return r; } - r = sd_bus_add_fallback_vtable(bus, "/org/freedesktop/systemd1/job", "org.freedesktop.systemd1.Job", bus_job_vtable, bus_job_find, m); + r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/job", "org.freedesktop.systemd1.Job", bus_job_vtable, bus_job_find, m); if (r < 0) { - log_error("Failed to register Job vtable: %s", strerror(-r)); + log_error_errno(-r, "Failed to register Job vtable: %m"); return r; } - r = sd_bus_add_node_enumerator(bus, "/org/freedesktop/systemd1/job", bus_job_enumerate, m); + r = sd_bus_add_node_enumerator(bus, NULL, "/org/freedesktop/systemd1/job", bus_job_enumerate, m); if (r < 0) { - log_error("Failed to add job enumerator: %s", strerror(-r)); + log_error_errno(-r, "Failed to add job enumerator: %m"); return r; } - r = sd_bus_add_fallback_vtable(bus, "/org/freedesktop/systemd1/unit", "org.freedesktop.systemd1.Unit", bus_unit_vtable, bus_unit_find, m); + r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", "org.freedesktop.systemd1.Unit", bus_unit_vtable, bus_unit_find, m); if (r < 0) { - log_error("Failed to register Unit vtable: %s", strerror(-r)); + log_error_errno(-r, "Failed to register Unit vtable: %m"); return r; } - r = sd_bus_add_node_enumerator(bus, "/org/freedesktop/systemd1/unit", bus_unit_enumerate, m); + r = sd_bus_add_node_enumerator(bus, NULL, "/org/freedesktop/systemd1/unit", bus_unit_enumerate, m); if (r < 0) { - log_error("Failed to add job enumerator: %s", strerror(-r)); + log_error_errno(-r, "Failed to add job enumerator: %m"); return r; } for (t = 0; t < _UNIT_TYPE_MAX; t++) { - r = sd_bus_add_fallback_vtable(bus, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, unit_vtable[t]->bus_vtable, bus_unit_interface_find, m); + r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, unit_vtable[t]->bus_vtable, bus_unit_interface_find, m); if (r < 0) { - log_error("Failed to register type specific vtable for %s: %s", unit_vtable[t]->bus_interface, strerror(-r)); + log_error_errno(-r, "Failed to register type specific vtable for %s: %m", unit_vtable[t]->bus_interface); return r; } if (unit_vtable[t]->cgroup_context_offset > 0) { - r = sd_bus_add_fallback_vtable(bus, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_unit_cgroup_vtable, bus_unit_cgroup_find, m); + r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_unit_cgroup_vtable, bus_unit_cgroup_find, m); if (r < 0) { - log_error("Failed to register control group unit vtable for %s: %s", unit_vtable[t]->bus_interface, strerror(-r)); + log_error_errno(-r, "Failed to register control group unit vtable for %s: %m", unit_vtable[t]->bus_interface); return r; } - r = sd_bus_add_fallback_vtable(bus, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_cgroup_vtable, bus_cgroup_context_find, m); + r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_cgroup_vtable, bus_cgroup_context_find, m); if (r < 0) { - log_error("Failed to register control group vtable for %s: %s", unit_vtable[t]->bus_interface, strerror(-r)); + log_error_errno(-r, "Failed to register control group vtable for %s: %m", unit_vtable[t]->bus_interface); return r; } } if (unit_vtable[t]->exec_context_offset > 0) { - r = sd_bus_add_fallback_vtable(bus, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_exec_vtable, bus_exec_context_find, m); + r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_exec_vtable, bus_exec_context_find, m); if (r < 0) { - log_error("Failed to register execute vtable for %s: %s", unit_vtable[t]->bus_interface, strerror(-r)); + log_error_errno(-r, "Failed to register execute vtable for %s: %m", unit_vtable[t]->bus_interface); return r; } } if (unit_vtable[t]->kill_context_offset > 0) { - r = sd_bus_add_fallback_vtable(bus, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_kill_vtable, bus_kill_context_find, m); + r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_kill_vtable, bus_kill_context_find, m); if (r < 0) { - log_error("Failed to register kill vtable for %s: %s", unit_vtable[t]->bus_interface, strerror(-r)); + log_error_errno(-r, "Failed to register kill vtable for %s: %m", unit_vtable[t]->bus_interface); return r; } } @@ -622,6 +622,7 @@ static int bus_setup_disconnected_match(Manager *m, sd_bus *bus) { r = sd_bus_add_match( bus, + NULL, "sender='org.freedesktop.DBus.Local'," "type='signal'," "path='/org/freedesktop/DBus/Local'," @@ -630,7 +631,7 @@ static int bus_setup_disconnected_match(Manager *m, sd_bus *bus) { signal_disconnected, m); if (r < 0) { - log_error("Failed to register match for Disconnected message: %s", strerror(-r)); + log_error_errno(-r, "Failed to register match for Disconnected message: %m"); return r; } @@ -658,7 +659,7 @@ static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void return 0; } - r = set_ensure_allocated(&m->private_buses, trivial_hash_func, trivial_compare_func); + r = set_ensure_allocated(&m->private_buses, NULL); if (r < 0) { log_oom(); return 0; @@ -666,13 +667,13 @@ static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void r = sd_bus_new(&bus); if (r < 0) { - log_warning("Failed to allocate new private connection bus: %s", strerror(-r)); + log_warning_errno(-r, "Failed to allocate new private connection bus: %m"); return 0; } r = sd_bus_set_fd(bus, nfd, nfd); if (r < 0) { - log_warning("Failed to set fd on new connection bus: %s", strerror(-r)); + log_warning_errno(-r, "Failed to set fd on new connection bus: %m"); return 0; } @@ -680,7 +681,7 @@ static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void r = bus_check_peercred(bus); if (r < 0) { - log_warning("Incoming private connection from unprivileged client, refusing: %s", strerror(-r)); + log_warning_errno(-r, "Incoming private connection from unprivileged client, refusing: %m"); return 0; } @@ -688,19 +689,19 @@ static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void r = sd_bus_set_server(bus, 1, id); if (r < 0) { - log_warning("Failed to enable server support for new connection bus: %s", strerror(-r)); + log_warning_errno(-r, "Failed to enable server support for new connection bus: %m"); return 0; } r = sd_bus_start(bus); if (r < 0) { - log_warning("Failed to start new connection bus: %s", strerror(-r)); + log_warning_errno(-r, "Failed to start new connection bus: %m"); return 0; } r = sd_bus_attach_event(bus, m->event, SD_EVENT_PRIORITY_NORMAL); if (r < 0) { - log_warning("Failed to attach new connection bus to event loop: %s", strerror(-r)); + log_warning_errno(-r, "Failed to attach new connection bus to event loop: %m"); return 0; } @@ -710,6 +711,7 @@ static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void r = sd_bus_add_match( bus, + NULL, "type='signal'," "interface='org.freedesktop.systemd1.Agent'," "member='Released'," @@ -717,7 +719,7 @@ static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void signal_agent_released, m); if (r < 0) { - log_warning("Failed to register Released match on new connection bus: %s", strerror(-r)); + log_warning_errno(-r, "Failed to register Released match on new connection bus: %m"); return 0; } } @@ -728,13 +730,13 @@ static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void r = bus_setup_api_vtables(m, bus); if (r < 0) { - log_warning("Failed to set up API vtables on new connection bus: %s", strerror(-r)); + log_warning_errno(-r, "Failed to set up API vtables on new connection bus: %m"); return 0; } r = set_put(m->private_buses, bus); if (r < 0) { - log_warning("Failed to add new conenction bus to set: %s", strerror(-r)); + log_warning_errno(-r, "Failed to add new conenction bus to set: %m"); return 0; } @@ -755,7 +757,7 @@ static int bus_list_names(Manager *m, sd_bus *bus) { r = sd_bus_list_names(bus, &names, NULL); if (r < 0) { - log_error("Failed to get initial list of names: %s", strerror(-r)); + log_error_errno(-r, "Failed to get initial list of names: %m"); return r; } @@ -774,12 +776,21 @@ static int bus_setup_api(Manager *m, sd_bus *bus) { assert(m); assert(bus); + /* Let's make sure we have enough credential bits so that we can make security and selinux decisions */ + r = sd_bus_negotiate_creds(bus, 1, + SD_BUS_CREDS_PID|SD_BUS_CREDS_UID| + SD_BUS_CREDS_EUID|SD_BUS_CREDS_EFFECTIVE_CAPS| + SD_BUS_CREDS_SELINUX_CONTEXT); + if (r < 0) + log_warning_errno(-r, "Failed to enable credential passing, ignoring: %m"); + r = bus_setup_api_vtables(m, bus); if (r < 0) return r; r = sd_bus_add_match( bus, + NULL, "type='signal'," "sender='org.freedesktop.DBus'," "path='/org/freedesktop/DBus'," @@ -787,10 +798,11 @@ static int bus_setup_api(Manager *m, sd_bus *bus) { "member='NameOwnerChanged'", signal_name_owner_changed, m); if (r < 0) - log_warning("Failed to subscribe to NameOwnerChanged signal: %s", strerror(-r)); + log_warning_errno(-r, "Failed to subscribe to NameOwnerChanged signal: %m"); r = sd_bus_add_match( bus, + NULL, "type='signal'," "sender='org.freedesktop.DBus'," "path='/org/freedesktop/DBus'," @@ -798,7 +810,7 @@ static int bus_setup_api(Manager *m, sd_bus *bus) { "member='ActivationRequest'", signal_activation_request, m); if (r < 0) - log_warning("Failed to subscribe to activation signal: %s", strerror(-r)); + log_warning_errno(-r, "Failed to subscribe to activation signal: %m"); /* Allow replacing of our name, to ease implementation of * reexecution, where we keep the old connection open until @@ -807,7 +819,7 @@ static int bus_setup_api(Manager *m, sd_bus *bus) { * finish */ r = sd_bus_request_name(bus,"org.freedesktop.systemd1", SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_ALLOW_REPLACEMENT); if (r < 0) { - log_error("Failed to register name: %s", strerror(-r)); + log_error_errno(-r, "Failed to register name: %m"); return r; } @@ -840,7 +852,7 @@ static int bus_init_api(Manager *m) { r = sd_bus_attach_event(bus, m->event, SD_EVENT_PRIORITY_NORMAL); if (r < 0) { - log_error("Failed to attach API bus to event loop: %s", strerror(-r)); + log_error_errno(-r, "Failed to attach API bus to event loop: %m"); return 0; } @@ -851,7 +863,7 @@ static int bus_init_api(Manager *m) { r = bus_setup_api(m, bus); if (r < 0) { - log_error("Failed to set up API bus: %s", strerror(-r)); + log_error_errno(-r, "Failed to set up API bus: %m"); return 0; } @@ -874,6 +886,7 @@ static int bus_setup_system(Manager *m, sd_bus *bus) { * the system bus */ r = sd_bus_add_match( bus, + NULL, "type='signal'," "interface='org.freedesktop.systemd1.Agent'," "member='Released'," @@ -881,7 +894,7 @@ static int bus_setup_system(Manager *m, sd_bus *bus) { signal_agent_released, m); if (r < 0) - log_warning("Failed to register Released match on system bus: %s", strerror(-r)); + log_warning_errno(-r, "Failed to register Released match on system bus: %m"); log_debug("Successfully connected to system bus."); return 0; @@ -912,13 +925,13 @@ static int bus_init_system(Manager *m) { r = sd_bus_attach_event(bus, m->event, SD_EVENT_PRIORITY_NORMAL); if (r < 0) { - log_error("Failed to attach system bus to event loop: %s", strerror(-r)); + log_error_errno(-r, "Failed to attach system bus to event loop: %m"); return 0; } r = bus_setup_system(m, bus); if (r < 0) { - log_error("Fauiled to set up system bus: %s", strerror(-r)); + log_error_errno(-r, "Failed to set up system bus: %m"); return 0; } @@ -953,7 +966,7 @@ static int bus_init_private(Manager *m) { return 0; strcpy(sa.un.sun_path, "/run/systemd/private"); - salen = offsetof(union sockaddr_union, un.sun_path) + sizeof("/run/systemd/private") - 1; + salen = offsetof(union sockaddr_union, un.sun_path) + strlen("/run/systemd/private"); } else { size_t left = sizeof(sa.un.sun_path); char *p = sa.un.sun_path; @@ -969,11 +982,10 @@ static int bus_init_private(Manager *m) { left = strpcpy(&p, left, "/systemd/private"); salen = sizeof(sa.un) - left; - - mkdir_parents_label(sa.un.sun_path, 0755); } - unlink(sa.un.sun_path); + (void) mkdir_parents_label(sa.un.sun_path, 0755); + (void) unlink(sa.un.sun_path); fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); if (fd < 0) { @@ -995,7 +1007,7 @@ static int bus_init_private(Manager *m) { r = sd_event_add_io(m->event, &s, fd, EPOLLIN, bus_on_connection, m); if (r < 0) { - log_error("Failed to allocate event source: %s", strerror(-r)); + log_error_errno(-r, "Failed to allocate event source: %m"); return r; } @@ -1043,8 +1055,8 @@ static void destroy_bus(Manager *m, sd_bus **bus) { m->subscribed = sd_bus_track_unref(m->subscribed); HASHMAP_FOREACH(j, m->jobs, i) - if (j->subscribed && sd_bus_track_get_bus(j->subscribed) == *bus) - j->subscribed = sd_bus_track_unref(j->subscribed); + if (j->clients && sd_bus_track_get_bus(j->clients) == *bus) + j->clients = sd_bus_track_unref(j->clients); /* Get rid of queued message on this bus */ if (m->queued_message_bus == *bus) { @@ -1086,10 +1098,9 @@ void bus_done(Manager *m) { if (m->private_listen_event_source) m->private_listen_event_source = sd_event_source_unref(m->private_listen_event_source); - if (m->private_listen_fd >= 0) { - close_nointr_nofail(m->private_listen_fd); - m->private_listen_fd = -1; - } + m->private_listen_fd = safe_close(m->private_listen_fd); + + bus_verify_polkit_async_registry_free(m->polkit_registry); } int bus_fdset_add_all(Manager *m, FDSet *fds) { @@ -1163,7 +1174,6 @@ int bus_foreach_bus( void bus_track_serialize(sd_bus_track *t, FILE *f) { const char *n; - assert(t); assert(f); for (n = sd_bus_track_first(t); n; n = sd_bus_track_next(t)) @@ -1178,7 +1188,7 @@ int bus_track_deserialize_item(char ***l, const char *line) { e = startswith(line, "subscribed="); if (!e) - return 0; + return -EINVAL; return strv_extend(l, e); } @@ -1214,3 +1224,20 @@ int bus_track_coldplug(Manager *m, sd_bus_track **t, char ***l) { return r; } + +int bus_verify_manage_unit_async(Manager *m, sd_bus_message *call, sd_bus_error *error) { + return bus_verify_polkit_async(call, CAP_SYS_ADMIN, "org.freedesktop.systemd1.manage-units", false, &m->polkit_registry, error); +} + +/* Same as bus_verify_manage_unit_async(), but checks for CAP_KILL instead of CAP_SYS_ADMIN */ +int bus_verify_manage_unit_async_for_kill(Manager *m, sd_bus_message *call, sd_bus_error *error) { + return bus_verify_polkit_async(call, CAP_KILL, "org.freedesktop.systemd1.manage-units", false, &m->polkit_registry, error); +} + +int bus_verify_manage_unit_files_async(Manager *m, sd_bus_message *call, sd_bus_error *error) { + return bus_verify_polkit_async(call, CAP_SYS_ADMIN, "org.freedesktop.systemd1.manage-unit-files", false, &m->polkit_registry, error); +} + +int bus_verify_reload_daemon_async(Manager *m, sd_bus_message *call, sd_bus_error *error) { + return bus_verify_polkit_async(call, CAP_SYS_ADMIN, "org.freedesktop.systemd1.reload-daemon", false, &m->polkit_registry, error); +}