diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-05-09 12:02:20 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-05-09 12:11:36 +0200 |
| commit | e6b1a2248ff164e14d1b2f495224faf8a8326142 (patch) | |
| tree | 33d98a5b9dd782965e84e8054dc7621779c347a2 /gnu/tests/ssh.scm | |
| parent | af55ca481d9e6c1d1e06632f96d550b42f33210f (diff) | |
| download | patches-e6b1a2248ff164e14d1b2f495224faf8a8326142.tar patches-e6b1a2248ff164e14d1b2f495224faf8a8326142.tar.gz | |
services: Log-in services now require "pam_loginuid".
Fixes <https://bugs.gnu.org/35553>.
Reported by Bruno Haible <bruno@clisp.org>.
* gnu/services/base.scm (login-pam-service): Pass #:login-uid? #t to
'unix-pam-service'.
* gnu/services/ssh.scm (lsh-pam-services, openssh-pam-services):
Likewise.
* gnu/services/xorg.scm (slim-pam-service): Likewise.
(gdm-pam-service): Likewise for "gdm-autologin" and "gdm-password".
* gnu/tests/base.scm (run-basic-test)["getlogin on tty1"]: New test.
* gnu/tests/ssh.scm (run-ssh-test): Add #:test-getlogin? parameter.
["getlogin"]: New test.
(%test-dropbear): Pass #:test-getlogin? #f.
Diffstat (limited to 'gnu/tests/ssh.scm')
| -rw-r--r-- | gnu/tests/ssh.scm | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/gnu/tests/ssh.scm b/gnu/tests/ssh.scm index e5cd439cdf..a74227ea4a 100644 --- a/gnu/tests/ssh.scm +++ b/gnu/tests/ssh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; @@ -31,7 +31,8 @@ #:export (%test-openssh %test-dropbear)) -(define* (run-ssh-test name ssh-service pid-file #:key (sftp? #f)) +(define* (run-ssh-test name ssh-service pid-file + #:key (sftp? #f) (test-getlogin? #t)) "Run a test of an OS running SSH-SERVICE, which writes its PID to PID-FILE. SSH-SERVICE must be configured to listen on port 22 and to allow for root and empty-password logins. @@ -54,10 +55,12 @@ When SFTP? is true, run an SFTP server test." (use-modules (gnu build marionette) (srfi srfi-26) (srfi srfi-64) + (ice-9 textual-ports) (ice-9 match) (ssh session) (ssh auth) (ssh channel) + (ssh popen) (ssh sftp)) (define marionette @@ -147,6 +150,20 @@ root with an empty password." (and (zero? (channel-get-exit-status channel)) (wait-for-file "/root/witness" marionette)))))) + ;; Check whether the 'getlogin' procedure returns the right thing. + (unless #$test-getlogin? + (test-skip 1)) + (test-equal "getlogin" + '(0 "root") + (call-with-connected-session/auth + (lambda (session) + (let* ((pipe (open-remote-input-pipe + session + "guile -c '(display (getlogin))'")) + (output (get-string-all pipe)) + (status (channel-get-exit-status pipe))) + (list status output))))) + ;; Connect to the guest over SFTP. Make sure we can write and ;; read a file there. (unless #$sftp? @@ -217,4 +234,9 @@ root with an empty password." (dropbear-configuration (root-login? #t) (allow-empty-passwords? #t))) - "/var/run/dropbear.pid")))) + "/var/run/dropbear.pid" + + ;; XXX: Our Dropbear is not built with PAM support. + ;; Even when it is, it seems to ignore the PAM + ;; 'session' requirements. + #:test-getlogin? #f)))) |