From 75131b469fa9e1e2e3cb623fa1f3d36cba36af78 Mon Sep 17 00:00:00 2001

From: Victor Toso <me@victortoso.com>

Date: Wed, 11 May 2016 19:34:13 +0200

Subject: [PATCH] logind: introduce LockedHint and SetLockedHint (#3238)

Desktop environments can keep this property up to date to allow

applications to easily track session's Lock status.

Cherry-picked from: 42d35e1301928d08dd32ec51f0205252ae658ba5

Resolves: #1335499

---

 src/login/logind-session-dbus.c       | 50 +++++++++++++++++++++++++++

 src/login/logind-session.c            | 17 +++++++++

 src/login/logind-session.h            |  4 +++

 src/login/org.freedesktop.login1.conf |  4 +++

 4 files changed, 75 insertions(+)

diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c

index 4e7edef52d..75b7186e8f 100644

--- a/src/login/logind-session-dbus.c

+++ b/src/login/logind-session-dbus.c

@@ -180,6 +180,24 @@ static int property_get_idle_since_hint(

         return sd_bus_message_append(reply, "t", u);

 }

+static int property_get_locked_hint(

+                sd_bus *bus,

+                const char *path,

+                const char *interface,

+                const char *property,

+                sd_bus_message *reply,

+                void *userdata,

+                sd_bus_error *error) {

+

+        Session *s = userdata;

+

+        assert(bus);

+        assert(reply);

+        assert(s);

+

+        return sd_bus_message_append(reply, "b", session_get_locked_hint(s) > 0);

+}

+

 static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {

         Session *s = userdata;

         int r;

@@ -255,6 +273,36 @@ static int method_set_idle_hint(sd_bus *bus, sd_bus_message *message, void *user

         return sd_bus_reply_method_return(message, NULL);

 }

+static int method_set_locked_hint(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {

+        _cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL;

+        Session *s = userdata;

+        uid_t uid;

+        int r, b;

+

+        assert(bus);

+        assert(message);

+        assert(s);

+

+        r = sd_bus_message_read(message, "b", &b);

+        if (r < 0)

+                return r;

+

+        r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_EUID, &creds);

+        if (r < 0)

+                return r;

+

+        r = sd_bus_creds_get_euid(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 may set locked hint");

+

+        session_set_locked_hint(s, b);

+

+        return sd_bus_reply_method_return(message, NULL);

+}

+

 static int method_kill(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {

         Session *s = userdata;

         const char *swho;

@@ -455,6 +503,7 @@ const sd_bus_vtable session_vtable[] = {

         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_PROPERTY("LockedHint", "b", property_get_locked_hint, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),

         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),

@@ -462,6 +511,7 @@ const sd_bus_vtable session_vtable[] = {

         SD_BUS_METHOD("Unlock", NULL, NULL, method_lock, 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("SetLockedHint", "b", NULL, method_set_locked_hint, SD_BUS_VTABLE_UNPRIVILEGED),

         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),

diff --git a/src/login/logind-session.c b/src/login/logind-session.c

index d2e7b40124..dc24539f12 100644

--- a/src/login/logind-session.c

+++ b/src/login/logind-session.c

@@ -843,6 +843,23 @@ void session_set_idle_hint(Session *s, bool b) {

         manager_send_changed(s->manager, "IdleHint", "IdleSinceHint", "IdleSinceHintMonotonic", NULL);

 }

+int session_get_locked_hint(Session *s) {

+        assert(s);

+

+        return s->locked_hint;

+}

+

+void session_set_locked_hint(Session *s, bool b) {

+        assert(s);

+

+        if (s->locked_hint == b)

+                return;

+

+        s->locked_hint = b;

+

+        session_send_changed(s, "LockedHint", NULL);

+}

+

 static int session_dispatch_fifo(sd_event_source *es, int fd, uint32_t revents, void *userdata) {

         Session *s = userdata;

diff --git a/src/login/logind-session.h b/src/login/logind-session.h

index a007fb5e84..5002b68689 100644

--- a/src/login/logind-session.h

+++ b/src/login/logind-session.h

@@ -111,6 +111,8 @@ struct Session {

         bool idle_hint;

         dual_timestamp idle_hint_timestamp;

+        bool locked_hint;

+

         bool in_gc_queue:1;

         bool started:1;

         bool stopping:1;

@@ -137,6 +139,8 @@ int session_activate(Session *s);

 bool session_is_active(Session *s);

 int session_get_idle_hint(Session *s, dual_timestamp *t);

 void session_set_idle_hint(Session *s, bool b);

+int session_get_locked_hint(Session *s);

+void session_set_locked_hint(Session *s, bool b);

 int session_create_fifo(Session *s);

 int session_start(Session *s);

 int session_stop(Session *s, bool force);

diff --git a/src/login/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf

index 1318328aa0..dc7e0bec20 100644

--- a/src/login/org.freedesktop.login1.conf

+++ b/src/login/org.freedesktop.login1.conf

@@ -160,6 +160,10 @@

                        send_interface="org.freedesktop.login1.Session"

                        send_member="SetIdleHint"/>

+                

+                       send_interface="org.freedesktop.login1.Session"

+                       send_member="SetLockedHint"/>

+

                        send_interface="org.freedesktop.login1.Session"

                        send_member="TakeControl"/>