More finely test PAM usage

Author: robert-ancell

tests/Makefile.am

@@ -19,6 +19,7 @@ TESTS = \
 	test-additional-system-config-priority \
 	test-headless \
 	test-autologin \
+	test-autologin-pam \
 	test-autologin-in-background \
 	test-autologin-guest-in-background \
 	test-autologin-timeout-in-background \
@@ -35,7 +36,6 @@ TESTS = \
 	test-change-authentication \
 	test-restart-authentication \
 	test-gobject-cancel-authentication \
-	test-pam \
 	test-login-pam \
 	test-denied \
 	test-expired \
@@ -329,12 +329,13 @@ EXTRA_DIST = \
 	scripts/autologin.conf \
 	scripts/autologin-guest.conf \
 	scripts/autologin-guest-fail-setup-script.conf \
+	scripts/autologin-guest-in-background.conf \
 	scripts/autologin-guest-logout.conf \
 	scripts/autologin-guest-session-config.conf \
 	scripts/autologin-guest-timeout.conf \
 	scripts/autologin-in-background.conf \
 	scripts/autologin-invalid-greeter.conf \
-	scripts/autologin-guest-in-background.conf \
+	scripts/autologin-pam.conf \
 	scripts/autologin-timeout-in-background.conf \
 	scripts/autologin-invalid-session.conf \
 	scripts/autologin-invalid-user.conf \
@@ -426,7 +427,6 @@ EXTRA_DIST = \
 	scripts/no-console-kit-or-login1.conf \
 	scripts/no-login1.conf \
 	scripts/open-file-descriptors.conf \
-	scripts/pam.conf \
 	scripts/power.conf \
 	scripts/power-no-console-kit.conf \
 	scripts/power-no-services.conf \

tests/scripts/pam.conf renamed to tests/scripts/autologin-pam.conf

@@ -1,11 +1,14 @@
 #
-# Check we handle conversations during each PAM method
+# Check we correctly use PAM for automatic login
 #
 
 [SeatDefaults]
-autologin-user=log-pam
+autologin-user=no-password1
 user-session=default
 
+[test-pam]
+log-events=true
+
 #?*START-DAEMON
 #?RUNNER DAEMON-START
 
@@ -17,14 +20,24 @@ user-session=default
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
+# Session authenticates
+#?PAM-no-password1 START SERVICE=lightdm-autologin USER=no-password1
+#?PAM-no-password1 AUTHENTICATE
+#?PAM-no-password1 ACCT-MGMT
+#?PAM-no-password1 SETCRED ESTABLISH_CRED
+#?PAM-no-password1 OPEN-SESSION
+
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/log-pam DESKTOP_SESSION=default USER=log-pam
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 #?SESSION-X-0 TERMINATE SIGNAL=15
+#?PAM-no-password1 CLOSE-SESSION
+#?PAM-no-password1 SETCRED DELETE_CRED
+#?PAM-no-password1 END
 #?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

tests/scripts/login-pam.conf

@@ -1,10 +1,13 @@
 #
-# Check we handle conversations during each PAM method
+# Check we correctly use PAM for login
 #
 
 [SeatDefaults]
 user-session=default
 
+[test-pam]
+log-events=true
+
 #?*START-DAEMON
 #?RUNNER DAEMON-START
 
@@ -16,6 +19,11 @@ user-session=default
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
+# Creat PAM session for greeter
+#?PAM-lightdm START SERVICE=lightdm-greeter USER=lightdm
+#?PAM-lightdm SETCRED ESTABLISH_CRED
+#?PAM-lightdm OPEN-SESSION
+
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
@@ -24,24 +32,37 @@ user-session=default
 #?GREETER-X-0 CONNECT-TO-DAEMON
 #?GREETER-X-0 CONNECTED-TO-DAEMON
 
-# Log into account with a password
-#?*GREETER-X-0 AUTHENTICATE USERNAME=log-pam
-#?GREETER-X-0 SHOW-MESSAGE TEXT="pam_authenticate"
+# Greeter does authentication via PAM
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?PAM-have-password1 START SERVICE=lightdm USER=have-password1
+#?PAM-have-password1 AUTHENTICATE
 #?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
 #?*GREETER-X-0 RESPOND TEXT="password"
-#?GREETER-X-0 SHOW-MESSAGE TEXT="pam_acct_mgmt"
-#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=log-pam AUTHENTICATED=TRUE
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+
+# User session starts
 #?*GREETER-X-0 START-SESSION
+#?PAM-have-password1 ACCT-MGMT
+#?PAM-have-password1 SETCRED ESTABLISH_CRED
+#?PAM-have-password1 OPEN-SESSION
+
+# Greeter session stops
 #?GREETER-X-0 TERMINATE SIGNAL=15
+#?PAM-lightdm CLOSE-SESSION
+#?PAM-lightdm SETCRED DELETE_CRED
+#?PAM-lightdm END
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/log-pam DESKTOP_SESSION=default USER=log-pam
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 #?SESSION-X-0 TERMINATE SIGNAL=15
+#?PAM-have-password1 CLOSE-SESSION
+#?PAM-have-password1 SETCRED DELETE_CRED
+#?PAM-have-password1 END
 #?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0