diff options
| -rw-r--r-- | src/login/logind-seat-dbus.c | 23 | ||||
| -rw-r--r-- | src/login/logind-session-dbus.c | 22 | ||||
| -rw-r--r-- | src/login/logind-user-dbus.c | 22 |
3 files changed, 58 insertions, 9 deletions
diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c index ddf2cd84a7..50b0b8842f 100644 --- a/src/login/logind-seat-dbus.c +++ b/src/login/logind-seat-dbus.c @@ -381,6 +381,7 @@ char *seat_bus_path(Seat *s) { int seat_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) { _cleanup_strv_free_ char **l = NULL; + sd_bus_message *message; Manager *m = userdata; Seat *seat; Iterator i; @@ -402,9 +403,25 @@ int seat_node_enumerator(sd_bus *bus, const char *path, void *userdata, char *** return r; } - r = strv_extend(&l, "/org/freedesktop/login1/seat/self"); - if (r < 0) - return r; + message = sd_bus_get_current_message(bus); + if (message) { + _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; + const char *name; + Session *session; + + r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_SESSION|SD_BUS_CREDS_AUGMENT, &creds); + if (r >= 0) { + r = sd_bus_creds_get_session(creds, &name); + if (r >= 0) { + session = hashmap_get(m->sessions, name); + if (session && session->seat) { + r = strv_extend(&l, "/org/freedesktop/login1/seat/self"); + if (r < 0) + return r; + } + } + } + } *nodes = l; l = NULL; diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c index d3411314d8..e3486fe5fc 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -541,6 +541,7 @@ char *session_bus_path(Session *s) { int session_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) { _cleanup_strv_free_ char **l = NULL; + sd_bus_message *message; Manager *m = userdata; Session *session; Iterator i; @@ -562,9 +563,24 @@ int session_node_enumerator(sd_bus *bus, const char *path, void *userdata, char return r; } - r = strv_extend(&l, "/org/freedesktop/login1/session/self"); - if (r < 0) - return r; + message = sd_bus_get_current_message(bus); + if (message) { + _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; + const char *name; + + r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_SESSION|SD_BUS_CREDS_AUGMENT, &creds); + if (r >= 0) { + r = sd_bus_creds_get_session(creds, &name); + if (r >= 0) { + session = hashmap_get(m->sessions, name); + if (session) { + r = strv_extend(&l, "/org/freedesktop/login1/session/self"); + if (r < 0) + return r; + } + } + } + } *nodes = l; l = NULL; diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c index bff42e89ad..5cfaac0d4f 100644 --- a/src/login/logind-user-dbus.c +++ b/src/login/logind-user-dbus.c @@ -291,6 +291,7 @@ char *user_bus_path(User *u) { int user_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) { _cleanup_strv_free_ char **l = NULL; + sd_bus_message *message; Manager *m = userdata; User *user; Iterator i; @@ -312,9 +313,24 @@ int user_node_enumerator(sd_bus *bus, const char *path, void *userdata, char *** return r; } - r = strv_extend(&l, "/org/freedesktop/login1/user/self"); - if (r < 0) - return r; + message = sd_bus_get_current_message(bus); + if (message) { + _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; + uid_t uid; + + r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_OWNER_UID|SD_BUS_CREDS_AUGMENT, &creds); + if (r >= 0) { + r = sd_bus_creds_get_owner_uid(creds, &uid); + if (r >= 0) { + user = hashmap_get(m->users, UID_TO_PTR(uid)); + if (user) { + r = strv_extend(&l, "/org/freedesktop/login1/user/self"); + if (r < 0) + return r; + } + } + } + } *nodes = l; l = NULL; |