diff options
author | David Herrmann <dh.herrmann@gmail.com> | 2015-01-18 12:59:39 +0100 |
---|---|---|
committer | David Herrmann <dh.herrmann@gmail.com> | 2015-01-18 12:59:39 +0100 |
commit | ca56b0a68300b035c605bedc5b339128897debfc (patch) | |
tree | b28a9af6a18fdecd0a1db0927322734b65a2285f /src/login/logind-user-dbus.c | |
parent | 7447362c530e3f7128f16a35d1e43da4251144cc (diff) |
logind: hide 'self' links if not available
If the caller does not run in a session/seat or has no tracked user, hide
the /org/freedesktop/login1/.../self links in introspection data.
Otherwise, "busctl tree org.freedesktop.login1" tries to query those nodes
even though it cant.
Diffstat (limited to 'src/login/logind-user-dbus.c')
-rw-r--r-- | src/login/logind-user-dbus.c | 22 |
1 files changed, 19 insertions, 3 deletions
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; |