Merge lp:~lbssousa/lightdm-gtk-greeter/fix-timed-autologin into lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk

[Laércio de Sousa]

This patch fixes a timed autologin issue. Currently, when autologin timeout expires, and configured autologin user is already selected in user list, lightdm-gtk-greeter's authentication_complete_cb() doesn't start user session unless user clicks on login button.

I've just found that global boolean variable "prompted" must be set to TRUE in timed autologin authentication callback function, in order to get user session started properly.

[lp:~lbssousa/lightdm-gtk-greeter/fix-timed-autologin]

326. By Laércio de Sousa on 2015-04-27

Avoid authenticating same use twice on timed autologin.

327. By Laércio de Sousa on 2015-04-27

Fix "prompted = TRUE;" misplacing in timed_autologin_cb() body.

[Laércio de Sousa (lbssousa)]

I've introduced some additional checks in order to avoid authenticating the same user twice (when it's selected in user list, and when lightdm_greeter_authenticate_autologin() is called).

[Andrew P. (kalgasnik)]

Thanks for clearing things up. Just one note.
Autologin will trigger each time a user locks screen with light-locker.
Greeter needs to perform a check to avoid it - "lightdm_greeter_get_lock_hint()".

[lp:~lbssousa/lightdm-gtk-greeter/fix-timed-autologin]

328. By Laércio de Sousa on 2015-05-11

Avoid triggering autologin if user locks screen with light-locker.

329. By Laércio de Sousa on 2015-05-11

Add missing argument in previous commit.

[Laércio de Sousa (lbssousa)]

Check added. Thank you for the appointment!

[Sean Davis (bluesabre)]

Thanks for investigating this. The patch here looks sane and this is a very welcome fix.

review: Approve

=== modified file 'src/lightdm-gtk-greeter.c'
--- src/lightdm-gtk-greeter.c	2015-03-27 05:29:45 +0000
+++ src/lightdm-gtk-greeter.c	2015-05-11 18:48:10 +0000
@@ -2281,6 +2281,33 @@
 }
 
 static void
+timed_autologin_cb (LightDMGreeter *greeter)
+{
+    /* Don't trigger autologin if user locks screen with light-locker (thanks to Andrew P.). */
+    if (!lightdm_greeter_get_lock_hint (greeter))
+    {
+        if (lightdm_greeter_get_is_authenticated (greeter))
+        {
+            /* Configured autologin user may be already selected in user list. */
+            if (lightdm_greeter_get_authentication_user (greeter))
+                /* Selected user matches configured autologin-user option. */
+                start_session ();
+            else if (lightdm_greeter_get_autologin_guest_hint (greeter))
+                /* "Guest session" is selected and autologin-guest is enabled. */
+                start_session ();
+            else if (lightdm_greeter_get_autologin_user_hint (greeter))
+            {
+                /* "Guest session" is selected, but autologin-user is configured. */
+                start_authentication (lightdm_greeter_get_autologin_user_hint (greeter));
+                prompted = TRUE;
+            }
+        }
+        else
+            lightdm_greeter_authenticate_autologin (greeter);
+    }
+}
+
+static void
 authentication_complete_cb (LightDMGreeter *greeter)
 {
     prompt_active = FALSE;
@@ -2625,7 +2652,7 @@
     g_signal_connect (greeter, "show-prompt", G_CALLBACK (show_prompt_cb), NULL);
     g_signal_connect (greeter, "show-message", G_CALLBACK (show_message_cb), NULL);
     g_signal_connect (greeter, "authentication-complete", G_CALLBACK (authentication_complete_cb), NULL);
-    g_signal_connect (greeter, "autologin-timer-expired", G_CALLBACK (lightdm_greeter_authenticate_autologin), NULL);
+    g_signal_connect (greeter, "autologin-timer-expired", G_CALLBACK (timed_autologin_cb), NULL);
     if (!lightdm_greeter_connect_sync (greeter, NULL))
         return EXIT_FAILURE;