From b1e364e4f5651888be7a075dad044b445e0f0236 Mon Sep 17 00:00:00 2001

From: Ray Strode <rstrode@redhat.com>

Date: Thu, 4 May 2017 15:34:33 -0400

Subject: [PATCH] manager: update session-id property when reusing display

If a display starts out its life as a greeter display, and then

gets reused for the user session, we need to update the session-id

property on the display to match its new session.

This is important so the reauthentication process match the

session with existing display and run in the proper context.

---

 daemon/gdm-manager.c | 12 ++++++++----

 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c

index 9201b9f8..3eef745f 100644

--- a/daemon/gdm-manager.c

+++ b/daemon/gdm-manager.c

@@ -1750,130 +1750,134 @@ start_user_session (GdmManager *manager,

 static void

 create_display_for_user_session (GdmManager *self,

                                  GdmSession *session,

                                  const char *session_id)

 {

         GdmDisplay *display;

         /* at the moment we only create GdmLocalDisplay objects on seat0 */

         const char *seat_id = "seat0";

         display = gdm_local_display_new ();

         g_object_set (G_OBJECT (display),

                       "session-class", "user",

                       "seat-id", seat_id,

                       "session-id", session_id,

                       NULL);

         gdm_display_store_add (self->priv->display_store,

                                display);

         g_object_set_data (G_OBJECT (session), "gdm-display", display);

 }

 static gboolean

 on_start_user_session (StartUserSessionOperation *operation)

 {

         GdmManager *self = operation->manager;

         gboolean migrated;

         gboolean fail_if_already_switched = TRUE;

         gboolean doing_initial_setup = FALSE;

         gboolean starting_user_session_right_away = TRUE;

         GdmDisplay *display;

+        const char *session_id;

         g_debug ("GdmManager: start or jump to session");

         /* If there's already a session running, jump to it.

          * If the only session running is the one we just opened,

          * start a session on it.

          */

         migrated = switch_to_compatible_user_session (operation->manager, operation->session, fail_if_already_switched);

         g_debug ("GdmManager: migrated: %d", migrated);

         if (migrated) {

                 /* We don't stop the manager here because

                    when Xorg exits it switches to the VT it was

                    started from.  That interferes with fast

                    user switching. */

                 gdm_session_reset (operation->session);

                 destroy_start_user_session_operation (operation);

                 goto out;

         }

         display = get_display_for_user_session (operation->session);

         g_object_get (G_OBJECT (display), "doing-initial-setup", &doing_initial_setup, NULL);

+        session_id = gdm_session_get_conversation_session_id (operation->session,

+                                                              operation->service_name);

+

         if (gdm_session_get_display_mode (operation->session) == GDM_SESSION_DISPLAY_MODE_REUSE_VT) {

                 /* In this case, the greeter's display is morphing into

                  * the user session display. Kill the greeter on this session

                  * and let the user session follow the same display. */

                 gdm_display_stop_greeter_session (display);

-                g_object_set (G_OBJECT (display), "session-class", "user", NULL);

+                g_object_set (G_OBJECT (display),

+                                "session-class", "user",

+                                "session-id", session_id,

+                                NULL);

         } else {

-                const char *session_id;

                 uid_t allowed_uid;

                 g_object_ref (display);

                 if (doing_initial_setup) {

                         g_debug ("GdmManager: closing down initial setup display");

                         gdm_display_stop_greeter_session (display);

                         gdm_display_unmanage (display);

                         gdm_display_finish (display);

                         /* We can't start the user session until the finished display

                          * starts to respawn (since starting an X server and bringing

                          * one down at the same time is a no go)

                          */

                         g_assert (self->priv->initial_login_operation == NULL);

                         self->priv->initial_login_operation = operation;

                         starting_user_session_right_away = FALSE;

                 } else {

                         g_debug ("GdmManager: session has its display server, reusing our server for another login screen");

                 }

                 /* The user session is going to follow the session worker

                  * into the new display. Untie it from this display and

                  * create a new embryonic session for a future user login. */

                 allowed_uid = gdm_session_get_allowed_user (operation->session);

                 g_object_set_data (G_OBJECT (display), "gdm-embryonic-user-session", NULL);

                 g_object_set_data (G_OBJECT (operation->session), "gdm-display", NULL);

                 create_embryonic_user_session_for_display (operation->manager, display, allowed_uid);

                 if (g_strcmp0 (operation->service_name, "gdm-autologin") == 0) {

                         /* remove the unused prepared greeter display since we're not going

                          * to have a greeter */

                         gdm_display_store_remove (self->priv->display_store, display);

                         g_object_unref (display);

                 }

                 /* Give the user session a new display object for bookkeeping purposes */

-                session_id = gdm_session_get_conversation_session_id (operation->session,

-                                                                      operation->service_name);

                 create_display_for_user_session (operation->manager,

                                                  operation->session,

                                                  session_id);

         }

         if (starting_user_session_right_away) {

                 start_user_session (operation->manager, operation);

         }

  out:

         return G_SOURCE_REMOVE;

 }

 static void

 queue_start_user_session (GdmManager *manager,

                           GdmSession *session,

                           const char *service_name)

 {

         StartUserSessionOperation *operation;

         operation = g_slice_new0 (StartUserSessionOperation);

         operation->manager = manager;

         operation->session = g_object_ref (session);

         operation->service_name = g_strdup (service_name);

         operation->idle_id = g_idle_add ((GSourceFunc) on_start_user_session, operation);

         g_object_set_data (G_OBJECT (session), "start-user-session-operation", operation);

 }

 static void

-- 

2.12.2