X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-session-dbus.c;h=a6b15f28a04a1b7034378a8cc6406f8780c4a47d;hp=d2e2364fc2b0431a20273010fa02d3dd79a2189e;hb=b298e98413a8bd112f0f7bd91a0dff3e7e931424;hpb=ebcf1f97de4f6b1580ae55eb56b1a3939fe6b602 diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c index d2e2364fc..a6b15f28a 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -25,7 +25,8 @@ #include "util.h" #include "strv.h" #include "bus-util.h" -#include "bus-errors.h" +#include "bus-common-errors.h" +#include "bus-label.h" #include "logind.h" #include "logind-session.h" @@ -187,7 +188,7 @@ static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata assert(message); assert(s); - r = session_stop(s); + r = session_stop(s, true); if (r < 0) return r; @@ -225,6 +226,7 @@ static int method_lock(sd_bus *bus, sd_bus_message *message, void *userdata, sd_ } static int method_set_idle_hint(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { + _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; Session *s = userdata; uid_t uid; int r, b; @@ -237,12 +239,16 @@ static int method_set_idle_hint(sd_bus *bus, sd_bus_message *message, void *user if (r < 0) return r; - r = sd_bus_get_owner_uid(bus, sd_bus_message_get_sender(message), &uid); + r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_UID, &creds); + if (r < 0) + return r; + + r = sd_bus_creds_get_uid(creds, &uid); if (r < 0) return r; if (uid != 0 && uid != s->user->uid) - return sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Only owner of session my set idle hint"); + return sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Only owner of session may set idle hint"); session_set_idle_hint(s, b); @@ -283,6 +289,7 @@ static int method_kill(sd_bus *bus, sd_bus_message *message, void *userdata, sd_ } static int method_take_control(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { + _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; Session *s = userdata; int r, force; uid_t uid; @@ -295,7 +302,11 @@ static int method_take_control(sd_bus *bus, sd_bus_message *message, void *userd if (r < 0) return r; - r = sd_bus_get_owner_uid(bus, sd_bus_message_get_sender(message), &uid); + r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_UID, &creds); + if (r < 0) + return r; + + r = sd_bus_creds_get_uid(creds, &uid); if (r < 0) return r; @@ -421,41 +432,41 @@ static int method_pause_device_complete(sd_bus *bus, sd_bus_message *message, vo const sd_bus_vtable session_vtable[] = { SD_BUS_VTABLE_START(0), - SD_BUS_PROPERTY("Id", "s", NULL, offsetof(Session, id), 0), - SD_BUS_PROPERTY("User", "(uo)", property_get_user, 0, 0), - SD_BUS_PROPERTY("Name", "s", property_get_name, 0, 0), - SD_BUS_PROPERTY("Timestamp", "t", NULL, offsetof(Session, timestamp.realtime), 0), - SD_BUS_PROPERTY("TimestampMonotonic", "t", NULL, offsetof(Session, timestamp.monotonic), 0), - SD_BUS_PROPERTY("VTNr", "u", NULL, offsetof(Session, vtnr), 0), - SD_BUS_PROPERTY("Seat", "(so)", property_get_seat, 0, 0), - SD_BUS_PROPERTY("TTY", "s", NULL, offsetof(Session, tty), 0), - SD_BUS_PROPERTY("Display", "s", NULL, offsetof(Session, display), 0), - SD_BUS_PROPERTY("Remote", "b", bus_property_get_bool, offsetof(Session, remote), 0), - SD_BUS_PROPERTY("RemoteHost", "s", NULL, offsetof(Session, remote_host), 0), - SD_BUS_PROPERTY("RemoteUser", "s", NULL, offsetof(Session, remote_user), 0), - SD_BUS_PROPERTY("Service", "s", NULL, offsetof(Session, service), 0), - SD_BUS_PROPERTY("Scope", "s", NULL, offsetof(Session, scope), 0), - SD_BUS_PROPERTY("Leader", "u", bus_property_get_pid, offsetof(Session, leader), 0), - SD_BUS_PROPERTY("Audit", "u", NULL, offsetof(Session, audit_id), 0), - SD_BUS_PROPERTY("Type", "s", property_get_type, offsetof(Session, type), 0), - SD_BUS_PROPERTY("Class", "s", property_get_class, offsetof(Session, class), 0), + SD_BUS_PROPERTY("Id", "s", NULL, offsetof(Session, id), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("User", "(uo)", property_get_user, 0, SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("Name", "s", property_get_name, 0, SD_BUS_VTABLE_PROPERTY_CONST), + BUS_PROPERTY_DUAL_TIMESTAMP("Timestamp", offsetof(Session, timestamp), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("VTNr", "u", NULL, offsetof(Session, vtnr), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("Seat", "(so)", property_get_seat, 0, SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("TTY", "s", NULL, offsetof(Session, tty), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("Display", "s", NULL, offsetof(Session, display), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("Remote", "b", bus_property_get_bool, offsetof(Session, remote), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("RemoteHost", "s", NULL, offsetof(Session, remote_host), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("RemoteUser", "s", NULL, offsetof(Session, remote_user), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("Service", "s", NULL, offsetof(Session, service), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("Desktop", "s", NULL, offsetof(Session, desktop), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("Scope", "s", NULL, offsetof(Session, scope), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("Leader", "u", bus_property_get_pid, offsetof(Session, leader), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("Audit", "u", NULL, offsetof(Session, audit_id), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("Type", "s", property_get_type, offsetof(Session, type), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("Class", "s", property_get_class, offsetof(Session, class), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("Active", "b", property_get_active, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), SD_BUS_PROPERTY("State", "s", property_get_state, 0, 0), SD_BUS_PROPERTY("IdleHint", "b", property_get_idle_hint, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), SD_BUS_PROPERTY("IdleSinceHint", "t", property_get_idle_since_hint, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), SD_BUS_PROPERTY("IdleSinceHintMonotonic", "t", property_get_idle_since_hint, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), - SD_BUS_METHOD("Terminate", NULL, NULL, method_terminate, 0), - SD_BUS_METHOD("Activate", NULL, NULL, method_activate, 0), + SD_BUS_METHOD("Terminate", NULL, NULL, method_terminate, SD_BUS_VTABLE_CAPABILITY(CAP_KILL)), + SD_BUS_METHOD("Activate", NULL, NULL, method_activate, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("Lock", NULL, NULL, method_lock, 0), SD_BUS_METHOD("Unlock", NULL, NULL, method_lock, 0), - SD_BUS_METHOD("SetIdleHint", "b", NULL, method_set_idle_hint, 0), - SD_BUS_METHOD("Kill", "si", NULL, method_kill, 0), - SD_BUS_METHOD("TakeControl", "b", NULL, method_take_control, 0), - SD_BUS_METHOD("ReleaseControl", NULL, NULL, method_release_control, 0), - SD_BUS_METHOD("TakeDevice", "uu", "hb", method_take_device, 0), - SD_BUS_METHOD("ReleaseDevice", "uu", NULL, method_release_device, 0), - SD_BUS_METHOD("PauseDeviceComplete", "uu", NULL, method_pause_device_complete, 0), + SD_BUS_METHOD("SetIdleHint", "b", NULL, method_set_idle_hint, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("Kill", "si", NULL, method_kill, SD_BUS_VTABLE_CAPABILITY(CAP_KILL)), + SD_BUS_METHOD("TakeControl", "b", NULL, method_take_control, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("ReleaseControl", NULL, NULL, method_release_control, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("TakeDevice", "uu", "hb", method_take_device, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("ReleaseDevice", "uu", NULL, method_release_device, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("PauseDeviceComplete", "uu", NULL, method_pause_device_complete, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_SIGNAL("PauseDevice", "uus", 0), SD_BUS_SIGNAL("ResumeDevice", "uuh", 0), @@ -465,7 +476,7 @@ const sd_bus_vtable session_vtable[] = { SD_BUS_VTABLE_END }; -int session_object_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata) { +int session_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) { Manager *m = userdata; Session *session; int r; @@ -477,16 +488,21 @@ int session_object_find(sd_bus *bus, const char *path, const char *interface, vo assert(m); if (streq(path, "/org/freedesktop/login1/session/self")) { + _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; sd_bus_message *message; pid_t pid; - message = sd_bus_get_current(bus); + message = sd_bus_get_current_message(bus); if (!message) return 0; - r = sd_bus_get_owner_pid(bus, sd_bus_message_get_sender(message), &pid); + r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_PID, &creds); if (r < 0) - return 0; + return r; + + r = sd_bus_creds_get_pid(creds, &pid); + if (r < 0) + return r; r = manager_get_session_by_pid(m, pid, &session); if (r <= 0) @@ -499,7 +515,7 @@ int session_object_find(sd_bus *bus, const char *path, const char *interface, vo if (!p) return 0; - e = sd_bus_label_unescape(p); + e = bus_label_unescape(p); if (!e) return -ENOMEM; @@ -517,14 +533,14 @@ char *session_bus_path(Session *s) { assert(s); - t = sd_bus_label_escape(s->id); + t = bus_label_escape(s->id); if (!t) return NULL; return strappend("/org/freedesktop/login1/session/", t); } -int session_node_enumerator(sd_bus *bus, const char *path, char ***nodes, void *userdata) { +int session_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) { _cleanup_strv_free_ char **l = NULL; Manager *m = userdata; Session *session; @@ -542,13 +558,15 @@ int session_node_enumerator(sd_bus *bus, const char *path, char ***nodes, void * if (!p) return -ENOMEM; - r = strv_push(&l, p); - if (r < 0) { - free(p); + r = strv_consume(&l, p); + if (r < 0) return r; - } } + r = strv_extend(&l, "/org/freedesktop/login1/session/self"); + if (r < 0) + return r; + *nodes = l; l = NULL; @@ -632,13 +650,16 @@ int session_send_create_reply(Session *s, sd_bus_error *error) { assert(s); - /* This is called after the session scope was successfully - * created, and finishes where bus_manager_create_session() - * left off. */ + /* This is called after the session scope and the user service + * were successfully created, and finishes where + * bus_manager_create_session() left off. */ if (!s->create_message) return 0; + if (!sd_bus_error_is_set(error) && (s->scope_job || s->user->service_job)) + return 0; + c = s->create_message; s->create_message = NULL; @@ -658,21 +679,23 @@ int session_send_create_reply(Session *s, sd_bus_error *error) { return -ENOMEM; log_debug("Sending reply about created session: " - "id=%s object_path=%s runtime_path=%s session_fd=%d seat=%s vtnr=%u", + "id=%s object_path=%s uid=%u runtime_path=%s " + "session_fd=%d seat=%s vtnr=%u", s->id, p, + (uint32_t) s->user->uid, s->user->runtime_path, fifo_fd, s->seat ? s->seat->id : "", (uint32_t) s->vtnr); return sd_bus_reply_method_return( - c, - "soshsub", + c, "soshusub", s->id, p, s->user->runtime_path, fifo_fd, + (uint32_t) s->user->uid, s->seat ? s->seat->id : "", (uint32_t) s->vtnr, false);