Attachment 139287 Details for Bug 106236 – service-client: Delay "no agent" authorization decision

[patch] service-client: Delay "no agent" authorization decision

service-client-Delay-no-agent-authorization-decisi.patch (text/plain), 6.27 KB, created by Zeeshan Ali on 2018-05-02 21:07:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zeeshan Ali

Created: 2018-05-02 21:07:39 UTC

Size: 6.27 KB

patch

obsolete

>From 0fb0dccdaa69df19c073be0308796f02dcc637c0 Mon Sep 17 00:00:00 2001
>From: Bastien Nocera <hadess@hadess.net>
>Date: Wed, 2 May 2018 11:47:34 +0200
>Subject: [PATCH] service-client: Delay "no agent" authorization decision
>
>To avoid applications being denied access to location services when
>gnome-shell hasn't had a chance to register its agent, either because
>Geoclue got auto-started by the application, or because the shell hasn't
>finished starting up, delay the authorization check until either an
>agent appears, or 5 seconds after the application requested the
>authorization.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=106236
>---
> src/gclue-service-client.c | 80 ++++++++++++++++++++++++++++++++++++++++------
> 1 file changed, 71 insertions(+), 9 deletions(-)
>
>diff --git a/src/gclue-service-client.c b/src/gclue-service-client.c
>index 13dd19d..17f947e 100644
>--- a/src/gclue-service-client.c
>+++ b/src/gclue-service-client.c
>@@ -29,6 +29,7 @@
> #include "gclue-config.h"
> 
> #define DEFAULT_ACCURACY_LEVEL GCLUE_ACCURACY_LEVEL_CITY
>+#define DEFAULT_AGENT_STARTUP_WAIT_SECS 5
> 
> static void
> gclue_service_client_client_iface_init (GClueDBusClientIface *iface);
>@@ -43,12 +44,16 @@ G_DEFINE_TYPE_WITH_CODE (GClueServiceClient,
>                          G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
>                                                 gclue_service_client_initable_iface_init));
> 
>+typedef struct _StartData StartData;
>+
> struct _GClueServiceClientPrivate
> {
>         GClueClientInfo *client_info;
>         const char *path;
>         GDBusConnection *connection;
>         GClueAgent *agent_proxy;
>+        StartData *pending_auth_start_data;
>+        guint pending_auth_timeout_id;
> 
>         GClueServiceLocation *location;
>         GClueServiceLocation *prev_location;
>@@ -328,13 +333,13 @@ on_agent_props_changed (GDBusProxy *agent_proxy,
>         g_variant_iter_free (iter);
> }
> 
>-typedef struct
>+struct _StartData
> {
>         GClueServiceClient *client;
>         GDBusMethodInvocation *invocation;
>         char *desktop_id;
>         GClueAccuracyLevel accuracy_level;
>-} StartData;
>+};
> 
> static void
> start_data_free (StartData *data)
>@@ -448,6 +453,56 @@ handle_post_agent_check_auth (StartData *data)
>                                         data);
> }
> 
>+static gboolean
>+handle_pending_auth (gpointer user_data)
>+{
>+        GClueServiceClientPrivate *priv = GCLUE_SERVICE_CLIENT (user_data)->priv;
>+        StartData *data = priv->pending_auth_start_data;
>+        guint32 uid;
>+
>+        uid = gclue_client_info_get_user_id (priv->client_info);
>+        if (priv->agent_proxy == NULL) {
>+                g_dbus_method_invocation_return_error (data->invocation,
>+                                                       G_DBUS_ERROR,
>+                                                       G_DBUS_ERROR_ACCESS_DENIED,
>+                                                       "'%s' disallowed, no agent "
>+                                                       "for UID %u",
>+                                                       data->desktop_id,
>+                                                       uid);
>+                start_data_free (data);
>+        } else {
>+                handle_post_agent_check_auth (data);
>+        }
>+
>+        priv->pending_auth_timeout_id = 0;
>+        priv->pending_auth_start_data = NULL;
>+
>+        return G_SOURCE_REMOVE;
>+}
>+
>+static void
>+set_pending_auth_timeout_enable (GClueDBusClient *client)
>+{
>+        GClueServiceClientPrivate *priv = GCLUE_SERVICE_CLIENT (client)->priv;
>+
>+        if (priv->pending_auth_timeout_id > 0)
>+                return;
>+        priv->pending_auth_timeout_id = g_timeout_add_seconds
>+                (DEFAULT_AGENT_STARTUP_WAIT_SECS, handle_pending_auth, client);
>+}
>+
>+static void
>+set_pending_auth_timeout_disable (GClueDBusClient *client)
>+{
>+        GClueServiceClientPrivate *priv = GCLUE_SERVICE_CLIENT (client)->priv;
>+
>+        if (priv->pending_auth_timeout_id == 0)
>+                return;
>+
>+        g_source_remove (priv->pending_auth_timeout_id);
>+        priv->pending_auth_timeout_id = 0;
>+}
>+
> static gboolean
> gclue_service_client_handle_start (GClueDBusClient       *client,
>                                    GDBusMethodInvocation *invocation)
>@@ -507,13 +562,17 @@ gclue_service_client_handle_start (GClueDBusClient       *client,
> 
>         /* No agent == No authorization */
>         if (priv->agent_proxy == NULL) {
>-                g_dbus_method_invocation_return_error (invocation,
>-                                                       G_DBUS_ERROR,
>-                                                       G_DBUS_ERROR_ACCESS_DENIED,
>-                                                       "'%s' disallowed, no agent "
>-                                                       "for UID %u",
>-                                                       desktop_id,
>-                                                       uid);
>+                /* Already a pending Start()? Denied! */
>+                if (priv->pending_auth_start_data) {
>+                        g_dbus_method_invocation_return_error_literal
>+                                (invocation,
>+                                 G_DBUS_ERROR,
>+                                 G_DBUS_ERROR_ACCESS_DENIED,
>+                                 "An authorization request is already pending");
>+                } else {
>+                        priv->pending_auth_start_data = data;
>+                        set_pending_auth_timeout_enable (client);
>+                }
>                 return TRUE;
>         }
> 
>@@ -540,6 +599,8 @@ gclue_service_client_finalize (GObject *object)
> 
>         g_clear_pointer (&priv->path, g_free);
>         g_clear_object (&priv->connection);
>+        set_pending_auth_timeout_disable (GCLUE_DBUS_CLIENT (object));
>+        g_clear_pointer (&priv->pending_auth_start_data, start_data_free);
>         if (priv->agent_proxy != NULL)
>                 g_signal_handlers_disconnect_by_func
>                                 (priv->agent_proxy,
>@@ -613,6 +674,7 @@ gclue_service_client_set_property (GObject      *object,
>                                           "g-properties-changed",
>                                           G_CALLBACK (on_agent_props_changed),
>                                           object);
>+                handle_pending_auth (client);
>                 break;
> 
>         default:
>-- 
>2.14.3

Actions: View | Splinter Review

Attachments on bug 106236: 139106 | 139125 | 139127 | 139138 | 139139 | 139158 | 139159 | 139164 | 139165 | 139166 | 139264 | 139265 | 139266 | 139275 | 139279 | 139285 | 139286 | 139287 | 139301

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.