Merge lp:~khadgaray/lightdm/1.2-auologin-uid into lp:lightdm/1.2

[Ritesh Khadgaray]

Add autologin support based off uid.

Fixes https://bugs.launchpad.net/lightdm/+bug/1260385. backport of lp:~mterry/lightdm/autologin-uid Remove .

[lp:~khadgaray/lightdm/1.2-auologin-uid]

1535. By Ritesh Khadgaray on 2013-12-12

fix typo

[Robert Ancell (robert-ancell)]

I am currently opposed to this feature, see bug for more details.

Unmerged revisions

1535. By Ritesh Khadgaray on 2013-12-12

fix typo

1534. By Ritesh Khadgaray on 2013-12-12

lightdm cannot autologin based on UID . backport of mterry's branch

=== modified file 'data/lightdm.conf'
--- data/lightdm.conf	2013-06-17 22:43:08 +0000
+++ data/lightdm.conf	2013-12-12 17:39:31 +0000
@@ -51,7 +51,7 @@
 # session-setup-script = Script to run when starting a user session (runs as root)
 # session-cleanup-script = Script to run when quitting a user session (runs as root)
 # autologin-guest = True to log in as guest by default
-# autologin-user = User to log in with by default (overrides autologin-guest)
+# autologin-user = User to log in with by default (overrides autologin-guest); can also specify uid with uid:XXX
 # autologin-user-timeout = Number of seconds to wait before loading default user
 # autologin-session = Session to load for automatic login (overrides user-session)
 # exit-on-failure = True if the daemon should exit if this seat fails

=== modified file 'src/accounts.c'
--- src/accounts.c	2013-06-17 23:10:20 +0000
+++ src/accounts.c	2013-12-12 17:39:31 +0000
@@ -291,6 +291,24 @@
 }
 
 const gchar *
+accounts_get_name_by_uid (uid_t uid)
+{
+    const gchar *name = NULL;
+
+    errno = 0;
+    struct passwd *user_info;
+
+    user_info = getpwuid (uid);
+    if (user_info)
+        name = user_info->pw_name;
+
+    if (!name && errno != 0)
+        g_warning ("Unable to get information on user %d: %s", uid, strerror (errno));
+
+    return name;
+}
+
+const gchar *
 user_get_name (User *user)
 {
     g_return_val_if_fail (user != NULL, NULL);

=== modified file 'src/accounts.h'
--- src/accounts.h	2011-11-29 04:42:03 +0000
+++ src/accounts.h	2013-12-12 17:39:31 +0000
@@ -40,6 +40,8 @@
 
 User *accounts_get_current_user (void);
 
+const gchar *accounts_get_name_by_uid (uid_t uid);
+
 GType user_get_type (void);
 
 const gchar *user_get_name (User *user);

=== modified file 'src/seat.c'
--- src/seat.c	2013-06-17 22:35:03 +0000
+++ src/seat.c	2013-12-12 17:39:31 +0000
@@ -9,6 +9,7 @@
  * license.
  */
 
+#include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/wait.h>
@@ -583,22 +584,49 @@
 {
 }
 
+static gchar *
+resolve_username (Seat *seat, const gchar *username)
+{
+    const gchar *const uidpfx = "uid:";
+    const gchar *resolved = NULL;
+
+    if (username == NULL || g_strcmp0 (username, "") == 0)
+        return NULL;
+
+    if (g_str_has_prefix (username, uidpfx))
+    {
+        const gchar *uidstr = username + strlen (uidpfx);
+        char *endptr = NULL;
+        int uid = strtol (uidstr, &endptr, 10);
+        if (endptr && endptr[0] == 0)
+            resolved = accounts_get_name_by_uid (uid);
+        else
+            g_debug (seat, "UID %s is not a number", uidstr);
+    }
+    else
+        resolved = username;
+
+    return g_strdup (resolved);
+}
+
 static gboolean
 seat_real_start (Seat *seat)
 {
-    const gchar *autologin_username;
+    gchar *autologin_username;
     int autologin_timeout;
 
     g_debug ("Starting seat");
 
     /* Start showing a greeter */
-    autologin_username = seat_get_string_property (seat, "autologin-user");
-    if (g_strcmp0 (autologin_username, "") == 0)
-        autologin_username = NULL;
+    autologin_username = resolve_username (seat, seat_get_string_property (seat, "autologin-user"));
     autologin_timeout = seat_get_integer_property (seat, "autologin-user-timeout");
 
-    if (autologin_username)
-        return switch_to_user_or_start_greeter (seat, autologin_username, TRUE, FALSE, NULL, FALSE, TRUE, autologin_timeout);
+    if (autologin_username) 
+    {
+        int ret = switch_to_user_or_start_greeter (seat, autologin_username, TRUE, FALSE, NULL, FALSE, TRUE, autologin_timeout);
+        g_free (autologin_username);
+        return ret;
+    }
     else if (seat_get_boolean_property (seat, "autologin-guest"))
         return switch_to_user_or_start_greeter (seat, NULL, TRUE, TRUE, NULL, FALSE, TRUE, autologin_timeout);
     else

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2013-11-26 03:18:34 +0000
+++ tests/Makefile.am	2013-12-12 17:39:31 +0000
@@ -24,6 +24,8 @@
 	test-autologin-new-authtok \
 	test-autologin-gobject-timeout \
 	test-autologin-gobject-guest-timeout \
+	test-autologin-uid \
+	test-autologin-uid-invalid \
 	test-pam \
 	test-login-pam \
 	test-denied \
@@ -172,6 +174,8 @@
 	test-login-qt-guest-logout
 endif
 
+TESTS =
+
 EXTRA_DIST = \
 	$(TESTS) \
 	data/system.conf \
@@ -201,6 +205,8 @@
 	scripts/autologin-session-crash.conf \
 	scripts/autologin-session-error.conf \
 	scripts/autologin-timeout.conf \
+	scripts/test-autologin-uid.conf \
+	scripts/test-autologin-uid-invalid.conf \
 	scripts/autologin-xserver-crash.conf \
 	scripts/console-kit.conf \
 	scripts/corrupt-xauthority.conf \

=== added file 'tests/scripts/autologin-uid-invalid.conf'
--- tests/scripts/autologin-uid-invalid.conf	1970-01-01 00:00:00 +0000
+++ tests/scripts/autologin-uid-invalid.conf	2013-12-12 17:39:31 +0000
@@ -0,0 +1,31 @@
+#
+# Check fails to autologin invalid user by uid
+#
+
+[SeatDefaults]
+autologin-user=uid:9999
+
+#?RUNNER DAEMON-START
+
+# (fails to start session for invalid user)
+
+# X server starts
+#?XSERVER-0 START VT=7
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Greeter starts
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+
+# Cleanup
+#?*STOP-DAEMON
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0

=== added file 'tests/scripts/autologin-uid.conf'
--- tests/scripts/autologin-uid.conf	1970-01-01 00:00:00 +0000
+++ tests/scripts/autologin-uid.conf	2013-12-12 17:39:31 +0000
@@ -0,0 +1,27 @@
+#
+# Check automatically logs in default user by uid
+#
+
+[SeatDefaults]
+autologin-user=uid:1000
+
+#?RUNNER DAEMON-START
+
+# X server starts
+#?XSERVER-0 START VT=7
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Session starts
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0

=== modified file 'tests/src/test-runner.c'
--- tests/src/test-runner.c	2013-11-26 03:18:34 +0000
+++ tests/src/test-runner.c	2013-12-12 17:39:31 +0000
@@ -2067,6 +2067,8 @@
         {"multi-prompt",     "password", TRUE,  "Multi Prompt",       NULL,  NULL, NULL,          NULL,          1031},
         /* This account has an existing corrupt X authority */
         {"corrupt-xauth",    "password", TRUE,  "Corrupt Xauthority", NULL,  NULL, NULL,          NULL,          1032},
+        /* 9999 is reserved as not present */
+        /* {"",              "",          "",                   9999}, */
         {NULL,               NULL,       FALSE, NULL,                 NULL,  NULL, NULL,          NULL,             0}
     };
     passwd_data = g_string_new ("");

=== added file 'tests/test-autologin-uid'
--- tests/test-autologin-uid	1970-01-01 00:00:00 +0000
+++ tests/test-autologin-uid	2013-12-12 17:39:31 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner autologin-uid test-gobject-greeter

=== added file 'tests/test-autologin-uid-invalid'
--- tests/test-autologin-uid-invalid	1970-01-01 00:00:00 +0000
+++ tests/test-autologin-uid-invalid	2013-12-12 17:39:31 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner autologin-uid-invalid test-gobject-greeter