X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-session-dbus.c;h=9f3217baf5041b0642080526c0624833e60036ed;hb=d2df0d0ed3a88e491405b403e6022e6619750130;hp=cda6a0a4827a3e9023e53b5bbbae7d7a2dcc39bf;hpb=cc3773810855956bad92337cee8fa193584ab62e;p=elogind.git diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c index cda6a0a48..9f3217baf 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -25,6 +25,7 @@ #include "util.h" #include "strv.h" #include "bus-util.h" +#include "bus-errors.h" #include "logind.h" #include "logind-session.h" @@ -36,8 +37,8 @@ static int property_get_user( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { _cleanup_free_ char *p = NULL; Session *s = userdata; @@ -59,8 +60,8 @@ static int property_get_name( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { Session *s = userdata; @@ -77,8 +78,8 @@ static int property_get_seat( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { _cleanup_free_ char *p = NULL; Session *s = userdata; @@ -103,8 +104,8 @@ static int property_get_active( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { Session *s = userdata; @@ -121,8 +122,8 @@ static int property_get_state( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { Session *s = userdata; @@ -139,8 +140,8 @@ static int property_get_idle_hint( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { Session *s = userdata; @@ -157,8 +158,8 @@ static int property_get_idle_since_hint( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { Session *s = userdata; dual_timestamp t; @@ -178,7 +179,7 @@ static int property_get_idle_since_hint( return sd_bus_message_append(reply, "t", u); } -static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata) { +static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Session *s = userdata; int r; @@ -188,12 +189,12 @@ static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata r = session_stop(s); if (r < 0) - return sd_bus_reply_method_errno(bus, message, r, NULL); + return r; - return sd_bus_reply_method_return(bus, message, NULL); + return sd_bus_reply_method_return(message, NULL); } -static int method_activate(sd_bus *bus, sd_bus_message *message, void *userdata) { +static int method_activate(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Session *s = userdata; int r; @@ -203,12 +204,12 @@ static int method_activate(sd_bus *bus, sd_bus_message *message, void *userdata) r = session_activate(s); if (r < 0) - return sd_bus_reply_method_errno(bus, message, r, NULL); + return r; - return sd_bus_reply_method_return(bus, message, NULL); + return sd_bus_reply_method_return(message, NULL); } -static int method_lock(sd_bus *bus, sd_bus_message *message, void *userdata) { +static int method_lock(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Session *s = userdata; int r; @@ -218,12 +219,12 @@ static int method_lock(sd_bus *bus, sd_bus_message *message, void *userdata) { r = session_send_lock(s, streq(sd_bus_message_get_member(message), "Lock")); if (r < 0) - return sd_bus_reply_method_errno(bus, message, r, NULL); + return r; - return sd_bus_reply_method_return(bus, message, NULL); + return sd_bus_reply_method_return(message, NULL); } -static int method_set_idle_hint(sd_bus *bus, sd_bus_message *message, void *userdata) { +static int method_set_idle_hint(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Session *s = userdata; uid_t uid; int r, b; @@ -234,21 +235,21 @@ static int method_set_idle_hint(sd_bus *bus, sd_bus_message *message, void *user r = sd_bus_message_read(message, "b", &b); if (r < 0) - return sd_bus_reply_method_errno(bus, message, r, NULL); + return r; r = sd_bus_get_owner_uid(bus, sd_bus_message_get_sender(message), &uid); if (r < 0) - return sd_bus_reply_method_errno(bus, message, r, NULL); + return r; if (uid != 0 && uid != s->user->uid) - return sd_bus_reply_method_errorf(bus, message, 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 my set idle hint"); session_set_idle_hint(s, b); - return sd_bus_reply_method_return(bus, message, NULL); + return sd_bus_reply_method_return(message, NULL); } -static int method_kill(sd_bus *bus, sd_bus_message *message, void *userdata) { +static int method_kill(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Session *s = userdata; const char *swho; int32_t signo; @@ -261,27 +262,27 @@ static int method_kill(sd_bus *bus, sd_bus_message *message, void *userdata) { r = sd_bus_message_read(message, "si", &swho, &signo); if (r < 0) - return sd_bus_reply_method_errno(bus, message, r, NULL); + return r; if (isempty(swho)) who = KILL_ALL; else { who = kill_who_from_string(swho); if (who < 0) - return sd_bus_reply_method_errorf(bus, message, SD_BUS_ERROR_INVALID_ARGS, "Invalid kill parameter '%s'", swho); + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid kill parameter '%s'", swho); } if (signo <= 0 || signo >= _NSIG) - return sd_bus_reply_method_errorf(bus, message, SD_BUS_ERROR_INVALID_ARGS, "Invalid signal %i", signo); + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid signal %i", signo); r = session_kill(s, who, signo); if (r < 0) - return sd_bus_reply_method_errno(bus, message, r, NULL); + return r; - return sd_bus_reply_method_return(bus, message, NULL); + return sd_bus_reply_method_return(message, NULL); } -static int method_take_control(sd_bus *bus, sd_bus_message *message, void *userdata) { +static int method_take_control(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Session *s = userdata; int r, force; uid_t uid; @@ -292,23 +293,23 @@ static int method_take_control(sd_bus *bus, sd_bus_message *message, void *userd r = sd_bus_message_read(message, "b", &force); if (r < 0) - return sd_bus_reply_method_errno(bus, message, r, NULL); + return r; r = sd_bus_get_owner_uid(bus, sd_bus_message_get_sender(message), &uid); if (r < 0) - return sd_bus_reply_method_errno(bus, message, r, NULL); + return r; if (uid != 0 && (force || uid != s->user->uid)) - return sd_bus_reply_method_errorf(bus, message, SD_BUS_ERROR_ACCESS_DENIED, "Only owner of session may take control"); + return sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Only owner of session may take control"); r = session_set_controller(s, sd_bus_message_get_sender(message), force); if (r < 0) - return sd_bus_reply_method_errno(bus, message, r, NULL); + return r; - return sd_bus_reply_method_return(bus, message, NULL); + return sd_bus_reply_method_return(message, NULL); } -static int method_release_control(sd_bus *bus, sd_bus_message *message, void *userdata) { +static int method_release_control(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Session *s = userdata; assert(bus); @@ -316,14 +317,14 @@ static int method_release_control(sd_bus *bus, sd_bus_message *message, void *us assert(s); if (!session_is_controller(s, sd_bus_message_get_sender(message))) - return sd_bus_reply_method_errorf(bus, message, BUS_ERROR_NOT_IN_CONTROL, "You are not in control of this session"); + return sd_bus_error_setf(error, BUS_ERROR_NOT_IN_CONTROL, "You are not in control of this session"); session_drop_controller(s); - return sd_bus_reply_method_return(bus, message, NULL); + return sd_bus_reply_method_return(message, NULL); } -static int method_take_device(sd_bus *bus, sd_bus_message *message, void *userdata) { +static int method_take_device(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Session *s = userdata; uint32_t major, minor; SessionDevice *sd; @@ -336,10 +337,10 @@ static int method_take_device(sd_bus *bus, sd_bus_message *message, void *userda r = sd_bus_message_read(message, "uu", &major, &minor); if (r < 0) - return sd_bus_reply_method_errno(bus, message, r, NULL); + return r; if (!session_is_controller(s, sd_bus_message_get_sender(message))) - return sd_bus_reply_method_errorf(bus, message, BUS_ERROR_NOT_IN_CONTROL, "You are not in control of this session"); + return sd_bus_error_setf(error, BUS_ERROR_NOT_IN_CONTROL, "You are not in control of this session"); dev = makedev(major, minor); sd = hashmap_get(s->devices, &dev); @@ -349,20 +350,20 @@ static int method_take_device(sd_bus *bus, sd_bus_message *message, void *userda * The caller should use dup() if it requires more * than one fd (it would be functionally * equivalent). */ - return sd_bus_reply_method_errorf(bus, message, BUS_ERROR_DEVICE_IS_TAKEN, "Device already taken"); + return sd_bus_error_setf(error, BUS_ERROR_DEVICE_IS_TAKEN, "Device already taken"); r = session_device_new(s, dev, &sd); if (r < 0) - return sd_bus_reply_method_errno(bus, message, r, NULL); + return r; - r = sd_bus_reply_method_return(bus, message, "hb", sd->fd, !sd->active); + r = sd_bus_reply_method_return(message, "hb", sd->fd, !sd->active); if (r < 0) session_device_free(sd); return r; } -static int method_release_device(sd_bus *bus, sd_bus_message *message, void *userdata) { +static int method_release_device(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Session *s = userdata; uint32_t major, minor; SessionDevice *sd; @@ -375,21 +376,21 @@ static int method_release_device(sd_bus *bus, sd_bus_message *message, void *use r = sd_bus_message_read(message, "uu", &major, &minor); if (r < 0) - return sd_bus_reply_method_errno(bus, message, r, NULL); + return r; if (!session_is_controller(s, sd_bus_message_get_sender(message))) - return sd_bus_reply_method_errorf(bus, message, BUS_ERROR_NOT_IN_CONTROL, "You are not in control of this session"); + return sd_bus_error_setf(error, BUS_ERROR_NOT_IN_CONTROL, "You are not in control of this session"); dev = makedev(major, minor); sd = hashmap_get(s->devices, &dev); if (!sd) - return sd_bus_reply_method_errorf(bus, message, BUS_ERROR_DEVICE_NOT_TAKEN, "Device not taken"); + return sd_bus_error_setf(error, BUS_ERROR_DEVICE_NOT_TAKEN, "Device not taken"); session_device_free(sd); - return sd_bus_reply_method_return(bus, message, NULL); + return sd_bus_reply_method_return(message, NULL); } -static int method_pause_device_complete(sd_bus *bus, sd_bus_message *message, void *userdata) { +static int method_pause_device_complete(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Session *s = userdata; uint32_t major, minor; SessionDevice *sd; @@ -402,19 +403,19 @@ static int method_pause_device_complete(sd_bus *bus, sd_bus_message *message, vo r = sd_bus_message_read(message, "uu", &major, &minor); if (r < 0) - return sd_bus_reply_method_errno(bus, message, r, NULL); + return r; if (!session_is_controller(s, sd_bus_message_get_sender(message))) - return sd_bus_reply_method_errorf(bus, message, BUS_ERROR_NOT_IN_CONTROL, "You are not in control of this session"); + return sd_bus_error_setf(error, BUS_ERROR_NOT_IN_CONTROL, "You are not in control of this session"); dev = makedev(major, minor); sd = hashmap_get(s->devices, &dev); if (!sd) - return sd_bus_reply_method_errorf(bus, message, BUS_ERROR_DEVICE_NOT_TAKEN, "Device not taken"); + return sd_bus_error_setf(error, BUS_ERROR_DEVICE_NOT_TAKEN, "Device not taken"); session_device_complete_pause(sd); - return sd_bus_reply_method_return(bus, message, NULL); + return sd_bus_reply_method_return(message, NULL); } const sd_bus_vtable session_vtable[] = { @@ -464,11 +465,10 @@ 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) { - _cleanup_free_ char *e = NULL; +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; - const char *p; + int r; assert(bus); assert(path); @@ -476,17 +476,37 @@ int session_object_find(sd_bus *bus, const char *path, const char *interface, vo assert(found); assert(m); - p = startswith(path, "/org/freedesktop/login1/session/"); - if (!p) - return 0; + if (streq(path, "/org/freedesktop/login1/session/self")) { + sd_bus_message *message; + pid_t pid; - e = bus_path_unescape(p); - if (!e) - return -ENOMEM; + message = sd_bus_get_current(bus); + if (!message) + return 0; - session = hashmap_get(m->sessions, e); - if (!session) - return 0; + r = sd_bus_get_owner_pid(bus, sd_bus_message_get_sender(message), &pid); + if (r < 0) + return 0; + + r = manager_get_session_by_pid(m, pid, &session); + if (r <= 0) + return 0; + } else { + _cleanup_free_ char *e = NULL; + const char *p; + + p = startswith(path, "/org/freedesktop/login1/session/"); + if (!p) + return 0; + + e = sd_bus_label_unescape(p); + if (!e) + return -ENOMEM; + + session = hashmap_get(m->sessions, e); + if (!session) + return 0; + } *found = session; return 1; @@ -497,14 +517,14 @@ char *session_bus_path(Session *s) { assert(s); - t = bus_path_escape(s->id); + t = sd_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; @@ -623,22 +643,31 @@ int session_send_create_reply(Session *s, sd_bus_error *error) { s->create_message = NULL; if (error) - return sd_bus_reply_method_error(s->manager->bus, c, error); - - /* Update the session state file before we notify the client - * about the result. */ - session_save(s); + return sd_bus_reply_method_error(c, error); fifo_fd = session_create_fifo(s); if (fifo_fd < 0) return fifo_fd; + /* Update the session state file before we notify the client + * about the result. */ + session_save(s); + p = session_bus_path(s); if (!p) return -ENOMEM; + log_debug("Sending reply about created session: " + "id=%s object_path=%s runtime_path=%s session_fd=%d seat=%s vtnr=%u", + s->id, + p, + s->user->runtime_path, + fifo_fd, + s->seat ? s->seat->id : "", + (uint32_t) s->vtnr); + return sd_bus_reply_method_return( - s->manager->bus, c, + c, "soshsub", s->id, p,