X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-seat-dbus.c;h=236af5eb9ebcbbfefaceeebb03331e144f29ba70;hp=7833d70a03425e8c8aa2025501afc79c73a2dee4;hb=5b04fe60004e7c5cd5a43648ede3e6a965e70b8c;hpb=f274ece0f76b5709408821e317e87aef76123db6 diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c index 7833d70a0..236af5eb9 100644 --- a/src/login/logind-seat-dbus.c +++ b/src/login/logind-seat-dbus.c @@ -21,401 +21,361 @@ #include #include +#include +#include "util.h" +#include "bus-util.h" +#include "strv.h" +#include "bus-errors.h" #include "logind.h" #include "logind-seat.h" -#include "dbus-common.h" -#include "util.h" -#define BUS_SEAT_INTERFACE \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - -#define INTROSPECTION \ - DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \ - "\n" \ - BUS_SEAT_INTERFACE \ - BUS_PROPERTIES_INTERFACE \ - BUS_PEER_INTERFACE \ - BUS_INTROSPECTABLE_INTERFACE \ - "\n" - -#define INTERFACES_LIST \ - BUS_GENERIC_INTERFACES_LIST \ - "org.freedesktop.login1.Seat\0" - -static int bus_seat_append_active(DBusMessageIter *i, const char *property, void *data) { - DBusMessageIter sub; - Seat *s = data; - const char *id, *path; - char *p = NULL; - - assert(i); - assert(property); +static int property_get_active_session( + sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { + + _cleanup_free_ char *p = NULL; + Seat *s = userdata; + + assert(bus); + assert(reply); assert(s); - if (!dbus_message_iter_open_container(i, DBUS_TYPE_STRUCT, NULL, &sub)) + p = s->active ? session_bus_path(s->active) : strdup("/"); + if (!p) return -ENOMEM; - if (s->active) { - id = s->active->id; - path = p = session_bus_path(s->active); + return sd_bus_message_append(reply, "(so)", s->active ? s->active->id : "", p); +} - if (!p) - return -ENOMEM; - } else { - id = ""; - path = "/"; - } +static int property_get_can_multi_session( + sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { - if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &id) || - !dbus_message_iter_append_basic(&sub, DBUS_TYPE_OBJECT_PATH, &path)) { - free(p); - return -ENOMEM; - } + Seat *s = userdata; - free(p); + assert(bus); + assert(reply); + assert(s); - if (!dbus_message_iter_close_container(i, &sub)) - return -ENOMEM; + return sd_bus_message_append(reply, "b", seat_can_multi_session(s)); +} - return 0; +static int property_get_can_tty( + sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { + + Seat *s = userdata; + + assert(bus); + assert(reply); + assert(s); + + return sd_bus_message_append(reply, "b", seat_can_tty(s)); } -static int bus_seat_append_sessions(DBusMessageIter *i, const char *property, void *data) { - DBusMessageIter sub, sub2; - Seat *s = data; +static int property_get_can_graphical( + sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { + + Seat *s = userdata; + + assert(bus); + assert(reply); + assert(s); + + return sd_bus_message_append(reply, "b", seat_can_graphical(s)); +} + +static int property_get_sessions( + sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { + + Seat *s = userdata; Session *session; + int r; - assert(i); - assert(property); + assert(bus); + assert(reply); assert(s); - if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(so)", &sub)) - return -ENOMEM; + r = sd_bus_message_open_container(reply, 'a', "(so)"); + if (r < 0) + return r; LIST_FOREACH(sessions_by_seat, session, s->sessions) { - char *p; - - if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2)) - return -ENOMEM; + _cleanup_free_ char *p = NULL; p = session_bus_path(session); if (!p) return -ENOMEM; - if (!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &session->id) || - !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_OBJECT_PATH, &p)) { - free(p); - return -ENOMEM; - } - - free(p); + r = sd_bus_message_append(reply, "(so)", session->id, p); + if (r < 0) + return r; - if (!dbus_message_iter_close_container(&sub, &sub2)) - return -ENOMEM; } - if (!dbus_message_iter_close_container(i, &sub)) - return -ENOMEM; + r = sd_bus_message_close_container(reply); + if (r < 0) + return r; - return 0; + return 1; } -static int bus_seat_append_can_multi_session(DBusMessageIter *i, const char *property, void *data) { - Seat *s = data; - dbus_bool_t b; - - assert(i); - assert(property); - assert(s); - - b = seat_can_multi_session(s); - - if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b)) - return -ENOMEM; - - return 0; -} +static int property_get_idle_hint( + sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { -static int bus_seat_append_can_tty(DBusMessageIter *i, const char *property, void *data) { - Seat *s = data; - dbus_bool_t b; + Seat *s = userdata; - assert(i); - assert(property); + assert(bus); + assert(reply); assert(s); - b = seat_can_tty(s); - - if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b)) - return -ENOMEM; - - return 0; + return sd_bus_message_append(reply, "b", seat_get_idle_hint(s, NULL) > 0); } -static int bus_seat_append_can_graphical(DBusMessageIter *i, const char *property, void *data) { - Seat *s = data; - dbus_bool_t b; +static int property_get_idle_since_hint( + sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { + + Seat *s = userdata; + dual_timestamp t; + uint64_t u; + int r; - assert(i); - assert(property); + assert(bus); + assert(reply); assert(s); - b = seat_can_graphical(s); + r = seat_get_idle_hint(s, &t); + if (r < 0) + return r; - if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b)) - return -ENOMEM; + u = streq(property, "IdleSinceHint") ? t.realtime : t.monotonic; - return 0; + return sd_bus_message_append(reply, "t", u); } -static int bus_seat_append_idle_hint(DBusMessageIter *i, const char *property, void *data) { - Seat *s = data; - dbus_bool_t b; +static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { + Seat *s = userdata; + int r; - assert(i); - assert(property); + assert(bus); + assert(message); assert(s); - b = seat_get_idle_hint(s, NULL) > 0; - if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b)) - return -ENOMEM; + r = seat_stop_sessions(s); + if (r < 0) + return r; - return 0; + return sd_bus_reply_method_return(message, NULL); } -static int bus_seat_append_idle_hint_since(DBusMessageIter *i, const char *property, void *data) { - Seat *s = data; - dual_timestamp t; - uint64_t k; +static int method_activate_session(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { + Seat *s = userdata; + const char *name; + Session *session; + int r; - assert(i); - assert(property); + assert(bus); + assert(message); assert(s); - seat_get_idle_hint(s, &t); - k = streq(property, "IdleSinceHint") ? t.realtime : t.monotonic; + r = sd_bus_message_read(message, "s", &name); + if (r < 0) + return r; - if (!dbus_message_iter_append_basic(i, DBUS_TYPE_UINT64, &k)) - return -ENOMEM; + session = hashmap_get(s->manager->sessions, name); + if (!session) + return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_SESSION, "No session '%s' known", name); - return 0; -} - -static int get_seat_for_path(Manager *m, const char *path, Seat **_s) { - Seat *s; - char *id; - - assert(m); - assert(path); - assert(_s); + if (session->seat != s) + return sd_bus_error_setf(error, BUS_ERROR_SESSION_NOT_ON_SEAT, "Session %s not on seat %s", name, s->id); - if (!startswith(path, "/org/freedesktop/login1/seat/")) - return -EINVAL; + r = session_activate(session); + if (r < 0) + return r; - id = bus_path_unescape(path + 29); - if (!id) - return -ENOMEM; + return sd_bus_reply_method_return(message, NULL); +} - s = hashmap_get(m->seats, id); - free(id); +const sd_bus_vtable seat_vtable[] = { + SD_BUS_VTABLE_START(0), - if (!s) - return -ENOENT; + SD_BUS_PROPERTY("Id", "s", NULL, offsetof(Seat, id), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("ActiveSession", "(so)", property_get_active_session, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("CanMultiSession", "b", property_get_can_multi_session, 0, SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("CanTTY", "b", property_get_can_tty, 0, SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("CanGraphical", "b", property_get_can_graphical, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("Sessions", "a(so)", property_get_sessions, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + 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), - *_s = s; - return 0; -} + SD_BUS_METHOD("Terminate", NULL, NULL, method_terminate, SD_BUS_VTABLE_CAPABILITY(CAP_KILL)), + SD_BUS_METHOD("ActivateSession", "s", NULL, method_activate_session, SD_BUS_VTABLE_UNPRIVILEGED), -static const BusProperty bus_login_seat_properties[] = { - { "Id", bus_property_append_string, "s", offsetof(Seat, id), true }, - { "ActiveSession", bus_seat_append_active, "(so)", 0 }, - { "CanMultiSession", bus_seat_append_can_multi_session, "b", 0 }, - { "CanTTY", bus_seat_append_can_tty, "b", 0 }, - { "CanGraphical", bus_seat_append_can_graphical, "b", 0 }, - { "Sessions", bus_seat_append_sessions, "a(so)", 0 }, - { "IdleHint", bus_seat_append_idle_hint, "b", 0 }, - { "IdleSinceHint", bus_seat_append_idle_hint_since, "t", 0 }, - { "IdleSinceHintMonotonic", bus_seat_append_idle_hint_since, "t", 0 }, - { NULL, } + SD_BUS_VTABLE_END }; -static DBusHandlerResult seat_message_dispatch( - Seat *s, - DBusConnection *connection, - DBusMessage *message) { - - DBusError error; - DBusMessage *reply = NULL; +int seat_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) { + Manager *m = userdata; + Seat *seat; int r; - assert(s); - assert(connection); - assert(message); + assert(bus); + assert(path); + assert(interface); + assert(found); + assert(m); - dbus_error_init(&error); + if (streq(path, "/org/freedesktop/login1/seat/self")) { + _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; + sd_bus_message *message; + Session *session; + pid_t pid; - if (dbus_message_is_method_call(message, "org.freedesktop.login1.Seat", "Terminate")) { + message = sd_bus_get_current(bus); + if (!message) + return 0; - r = seat_stop_sessions(s); + r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_PID, &creds); if (r < 0) - return bus_send_error_reply(connection, message, NULL, r); + return r; - reply = dbus_message_new_method_return(message); - if (!reply) - goto oom; - - } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Seat", "ActivateSession")) { - const char *name; - Session *session; - - if (!dbus_message_get_args( - message, - &error, - DBUS_TYPE_STRING, &name, - DBUS_TYPE_INVALID)) - return bus_send_error_reply(connection, message, &error, -EINVAL); + r = sd_bus_creds_get_pid(creds, &pid); + if (r < 0) + return r; - session = hashmap_get(s->manager->sessions, name); - if (!session || session->seat != s) - return bus_send_error_reply(connection, message, &error, -ENOENT); + r = manager_get_session_by_pid(m, pid, &session); + if (r <= 0) + return 0; - r = session_activate(session); - if (r < 0) - return bus_send_error_reply(connection, message, NULL, r); + if (!session->seat) + return 0; - reply = dbus_message_new_method_return(message); - if (!reply) - goto oom; + seat = session->seat; } else { - const BusBoundProperties bps[] = { - { "org.freedesktop.login1.Seat", bus_login_seat_properties, s }, - { NULL, } - }; - return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps); - } + _cleanup_free_ char *e = NULL; + const char *p; - if (reply) { - if (!dbus_connection_send(connection, reply, NULL)) - goto oom; + p = startswith(path, "/org/freedesktop/login1/seat/"); + if (!p) + return 0; - dbus_message_unref(reply); + e = sd_bus_label_unescape(p); + if (!e) + return -ENOMEM; + + seat = hashmap_get(m->seats, e); + if (!seat) + return 0; } - return DBUS_HANDLER_RESULT_HANDLED; + *found = seat; + return 1; +} -oom: - if (reply) - dbus_message_unref(reply); +char *seat_bus_path(Seat *s) { + _cleanup_free_ char *t = NULL; - dbus_error_free(&error); + assert(s); - return DBUS_HANDLER_RESULT_NEED_MEMORY; -} + t = sd_bus_label_escape(s->id); + if (!t) + return NULL; -static DBusHandlerResult seat_message_handler( - DBusConnection *connection, - DBusMessage *message, - void *userdata) { + return strappend("/org/freedesktop/login1/seat/", t); +} +int seat_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; - Seat *s; + Seat *seat; + Iterator i; int r; - r = get_seat_for_path(m, dbus_message_get_path(message), &s); - if (r < 0) { + assert(bus); + assert(path); + assert(nodes); - if (r == -ENOMEM) - return DBUS_HANDLER_RESULT_NEED_MEMORY; + HASHMAP_FOREACH(seat, m->seats, i) { + char *p; - if (r == -ENOENT) { - DBusError e; + p = seat_bus_path(seat); + if (!p) + return -ENOMEM; - dbus_error_init(&e); - dbus_set_error_const(&e, DBUS_ERROR_UNKNOWN_OBJECT, "Unknown seat"); - return bus_send_error_reply(connection, message, &e, r); + r = strv_push(&l, p); + if (r < 0) { + free(p); + return r; } - - return bus_send_error_reply(connection, message, NULL, r); } - return seat_message_dispatch(s, connection, message); -} + *nodes = l; + l = NULL; -const DBusObjectPathVTable bus_seat_vtable = { - .message_function = seat_message_handler -}; - -char *seat_bus_path(Seat *s) { - char *t, *r; - - assert(s); - - t = bus_path_escape(s->id); - if (!t) - return NULL; - - r = strappend("/org/freedesktop/login1/seat/", t); - free(t); - - return r; + return 1; } int seat_send_signal(Seat *s, bool new_seat) { - DBusMessage *m; - int r = -ENOMEM; - char *p = NULL; + _cleanup_free_ char *p = NULL; assert(s); - m = dbus_message_new_signal("/org/freedesktop/login1", - "org.freedesktop.login1.Manager", - new_seat ? "SeatNew" : "SeatRemoved"); - - if (!m) - return -ENOMEM; - p = seat_bus_path(s); if (!p) - goto finish; - - if (!dbus_message_append_args( - m, - DBUS_TYPE_STRING, &s->id, - DBUS_TYPE_OBJECT_PATH, &p, - DBUS_TYPE_INVALID)) - goto finish; - - if (!dbus_connection_send(s->manager->bus, m, NULL)) - goto finish; - - r = 0; - -finish: - dbus_message_unref(m); - free(p); + return -ENOMEM; - return r; + return sd_bus_emit_signal( + s->manager->bus, + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + new_seat ? "SeatNew" : "SeatRemoved", + "so", s->id, p); } -int seat_send_changed(Seat *s, const char *properties) { - DBusMessage *m; - int r = -ENOMEM; - char *p = NULL; +int seat_send_changed(Seat *s, const char *properties, ...) { + _cleanup_free_ char *p = NULL; + char **l; assert(s); @@ -426,19 +386,7 @@ int seat_send_changed(Seat *s, const char *properties) { if (!p) return -ENOMEM; - m = bus_properties_changed_new(p, "org.freedesktop.login1.Seat", properties); - if (!m) - goto finish; - - if (!dbus_connection_send(s->manager->bus, m, NULL)) - goto finish; - - r = 0; - -finish: - if (m) - dbus_message_unref(m); - free(p); + l = strv_from_stdarg_alloca(properties); - return r; + return sd_bus_emit_properties_changed_strv(s->manager->bus, p, "org.freedesktop.login1.Seat", l); }