From 156bd855d41a3165977936a88ca9dc2d39a43e55 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 9 May 2009 22:39:12 +0000 Subject: [PATCH] Since chpasswd is now PAM enabled, the crypt tests are passed with chgpasswd. Do not copy the database which should not change. Directly compare the system files with the files from config/. Update some test descriptions. --- tests/crypt/login.defs_MD5/02_chgpasswd.test | 39 +++++++++++ .../02_chgpasswd}/group | 0 .../02_chgpasswd}/gshadow | 2 +- .../02_chgpasswd}/passwd | 0 .../crypt/login.defs_MD5/02_chgpasswd/shadow | 19 ++++++ .../01_chpasswd.test | 6 +- .../02_chgpasswd.test | 39 +++++++++++ .../02_chgpasswd}/gshadow | 2 +- .../01_chpasswd.test | 6 +- .../01_chpasswd/group | 41 ------------ .../01_chpasswd/passwd | 19 ------ .../02_chgpasswd.test | 45 +++++++++++++ .../02_chgpasswd}/gshadow | 2 +- .../01_chpasswd.test | 6 +- .../01_chpasswd/group | 41 ------------ .../01_chpasswd/passwd | 19 ------ .../02_chgpasswd.test | 64 +++++++++++++++++++ .../02_chgpasswd/gshadow | 41 ++++++++++++ .../01_chpasswd.test | 6 +- .../01_chpasswd/group | 41 ------------ .../01_chpasswd/passwd | 19 ------ .../02_chgpasswd.test | 45 +++++++++++++ .../02_chgpasswd/gshadow | 41 ++++++++++++ .../crypt/login.defs_SHA256/01_chpasswd.test | 6 +- .../crypt/login.defs_SHA256/01_chpasswd/group | 41 ------------ .../login.defs_SHA256/01_chpasswd/gshadow | 41 ------------ .../login.defs_SHA256/01_chpasswd/passwd | 19 ------ .../crypt/login.defs_SHA256/02_chgpasswd.test | 39 +++++++++++ .../login.defs_SHA256/02_chgpasswd/gshadow | 41 ++++++++++++ .../crypt/login.defs_SHA512/01_chpasswd.test | 6 +- .../crypt/login.defs_SHA512/01_chpasswd/group | 41 ------------ .../login.defs_SHA512/01_chpasswd/gshadow | 41 ------------ .../login.defs_SHA512/01_chpasswd/passwd | 19 ------ .../crypt/login.defs_SHA512/02_chgpasswd.test | 39 +++++++++++ .../login.defs_SHA512/02_chgpasswd/gshadow | 41 ++++++++++++ tests/crypt/login.defs_none/01_chpasswd.test | 6 +- tests/crypt/login.defs_none/01_chpasswd/group | 41 ------------ .../crypt/login.defs_none/01_chpasswd/gshadow | 41 ------------ .../crypt/login.defs_none/01_chpasswd/passwd | 19 ------ tests/crypt/login.defs_none/02_chgpasswd.test | 39 +++++++++++ .../02_chgpasswd}/gshadow | 2 +- 41 files changed, 557 insertions(+), 508 deletions(-) create mode 100755 tests/crypt/login.defs_MD5/02_chgpasswd.test rename tests/crypt/{login.defs_MD5_CRYPT_ENAB/01_chpasswd => login.defs_MD5/02_chgpasswd}/group (100%) rename tests/crypt/{login.defs_MD5_CRYPT_ENAB/01_chpasswd => login.defs_MD5/02_chgpasswd}/gshadow (93%) rename tests/crypt/{login.defs_MD5_CRYPT_ENAB/01_chpasswd => login.defs_MD5/02_chgpasswd}/passwd (100%) create mode 100644 tests/crypt/login.defs_MD5/02_chgpasswd/shadow create mode 100755 tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd.test rename tests/crypt/{login.defs_SHA256-round-min-max/01_chpasswd => login.defs_MD5_CRYPT_ENAB/02_chgpasswd}/gshadow (93%) delete mode 100644 tests/crypt/login.defs_SHA256-round-max/01_chpasswd/group delete mode 100644 tests/crypt/login.defs_SHA256-round-max/01_chpasswd/passwd create mode 100755 tests/crypt/login.defs_SHA256-round-max/02_chgpasswd.test rename tests/crypt/{login.defs_SHA256-round-min/01_chpasswd => login.defs_SHA256-round-max/02_chgpasswd}/gshadow (93%) delete mode 100644 tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/group delete mode 100644 tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/passwd create mode 100755 tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd.test create mode 100644 tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/gshadow delete mode 100644 tests/crypt/login.defs_SHA256-round-min/01_chpasswd/group delete mode 100644 tests/crypt/login.defs_SHA256-round-min/01_chpasswd/passwd create mode 100755 tests/crypt/login.defs_SHA256-round-min/02_chgpasswd.test create mode 100644 tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/gshadow delete mode 100644 tests/crypt/login.defs_SHA256/01_chpasswd/group delete mode 100644 tests/crypt/login.defs_SHA256/01_chpasswd/gshadow delete mode 100644 tests/crypt/login.defs_SHA256/01_chpasswd/passwd create mode 100755 tests/crypt/login.defs_SHA256/02_chgpasswd.test create mode 100644 tests/crypt/login.defs_SHA256/02_chgpasswd/gshadow delete mode 100644 tests/crypt/login.defs_SHA512/01_chpasswd/group delete mode 100644 tests/crypt/login.defs_SHA512/01_chpasswd/gshadow delete mode 100644 tests/crypt/login.defs_SHA512/01_chpasswd/passwd create mode 100755 tests/crypt/login.defs_SHA512/02_chgpasswd.test create mode 100644 tests/crypt/login.defs_SHA512/02_chgpasswd/gshadow delete mode 100644 tests/crypt/login.defs_none/01_chpasswd/group delete mode 100644 tests/crypt/login.defs_none/01_chpasswd/gshadow delete mode 100644 tests/crypt/login.defs_none/01_chpasswd/passwd create mode 100755 tests/crypt/login.defs_none/02_chgpasswd.test rename tests/crypt/{login.defs_SHA256-round-max/01_chpasswd => login.defs_none/02_chgpasswd}/gshadow (93%) diff --git a/tests/crypt/login.defs_MD5/02_chgpasswd.test b/tests/crypt/login.defs_MD5/02_chgpasswd.test new file mode 100755 index 00000000..c102e890 --- /dev/null +++ b/tests/crypt/login.defs_MD5/02_chgpasswd.test @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +cd $(dirname $0) + +. ../../common/config.sh +. ../../common/log.sh + +log_start "$0" "Change a group password" + +save_config + +# restore the files on exit +trap 'log_status "$0" "FAILURE"; restore_config' 0 + +change_config + +echo -n "echo nogroup:test | chgpasswd..." +echo nogroup:test | chgpasswd +echo "OK" + +echo -n "Check the passwd file..." +../../common/compare_file.pl 02_chgpasswd/passwd /etc/passwd +echo "OK" +echo -n "Check the group file..." +../../common/compare_file.pl 02_chgpasswd/group /etc/group +echo "OK" +echo -n "Check the shadow file..." +../../common/compare_file.pl 02_chgpasswd/shadow /etc/shadow +echo "OK" +echo -n "Check the gshadow file..." +../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow +echo "OK" + +log_status "$0" "SUCCESS" +restore_config +trap '' 0 + diff --git a/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/group b/tests/crypt/login.defs_MD5/02_chgpasswd/group similarity index 100% rename from tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/group rename to tests/crypt/login.defs_MD5/02_chgpasswd/group diff --git a/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/gshadow b/tests/crypt/login.defs_MD5/02_chgpasswd/gshadow similarity index 93% rename from tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/gshadow rename to tests/crypt/login.defs_MD5/02_chgpasswd/gshadow index ae424865..a709bcbe 100644 --- a/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/gshadow +++ b/tests/crypt/login.defs_MD5/02_chgpasswd/gshadow @@ -36,6 +36,6 @@ plugdev:*:: staff:*:: games:*:: users:*:: -nogroup:*:: +nogroup:@PASS_MD5 test@:: crontab:x:: Debian-exim:x:: diff --git a/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/passwd b/tests/crypt/login.defs_MD5/02_chgpasswd/passwd similarity index 100% rename from tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/passwd rename to tests/crypt/login.defs_MD5/02_chgpasswd/passwd diff --git a/tests/crypt/login.defs_MD5/02_chgpasswd/shadow b/tests/crypt/login.defs_MD5/02_chgpasswd/shadow new file mode 100644 index 00000000..5f50d187 --- /dev/null +++ b/tests/crypt/login.defs_MD5/02_chgpasswd/shadow @@ -0,0 +1,19 @@ +root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: +daemon:*:12977:0:99999:7::: +bin:*:12977:0:99999:7::: +sys:*:12977:0:99999:7::: +sync:*:12977:0:99999:7::: +games:*:12977:0:99999:7::: +man:*:12977:0:99999:7::: +lp:*:12977:0:99999:7::: +mail:*:12977:0:99999:7::: +news:*:12977:0:99999:7::: +uucp:*:12977:0:99999:7::: +proxy:*:12977:0:99999:7::: +www-data:*:12977:0:99999:7::: +backup:*:12977:0:99999:7::: +list:*:12977:0:99999:7::: +irc:*:12977:0:99999:7::: +gnats:*:12977:0:99999:7::: +nobody:*:12977:0:99999:7::: +Debian-exim:!:12977:0:99999:7::: diff --git a/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd.test b/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd.test index d5835170..28ee58ff 100755 --- a/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd.test +++ b/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd.test @@ -21,16 +21,16 @@ echo nobody:test | chpasswd echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl 01_chpasswd/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl 01_chpasswd/group /etc/group +../../common/compare_file.pl config/etc/group /etc/group echo "OK" echo -n "Check the shadow file..." ../../common/compare_file.pl 01_chpasswd/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl 01_chpasswd/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd.test b/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd.test new file mode 100755 index 00000000..a38a669c --- /dev/null +++ b/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd.test @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +cd $(dirname $0) + +. ../../common/config.sh +. ../../common/log.sh + +log_start "$0" "Change a group password" + +save_config + +# restore the files on exit +trap 'log_status "$0" "FAILURE"; restore_config' 0 + +change_config + +echo -n "echo nogroup:test | chgpasswd..." +echo nogroup:test | chgpasswd +echo "OK" + +echo -n "Check the passwd file..." +../../common/compare_file.pl config/etc/passwd /etc/passwd +echo "OK" +echo -n "Check the group file..." +../../common/compare_file.pl config/etc/group /etc/group +echo "OK" +echo -n "Check the shadow file..." +../../common/compare_file.pl config/etc/shadow /etc/shadow +echo "OK" +echo -n "Check the gshadow file..." +../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow +echo "OK" + +log_status "$0" "SUCCESS" +restore_config +trap '' 0 + diff --git a/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/gshadow b/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/gshadow similarity index 93% rename from tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/gshadow rename to tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/gshadow index ae424865..a709bcbe 100644 --- a/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/gshadow +++ b/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/gshadow @@ -36,6 +36,6 @@ plugdev:*:: staff:*:: games:*:: users:*:: -nogroup:*:: +nogroup:@PASS_MD5 test@:: crontab:x:: Debian-exim:x:: diff --git a/tests/crypt/login.defs_SHA256-round-max/01_chpasswd.test b/tests/crypt/login.defs_SHA256-round-max/01_chpasswd.test index 1eb51c9a..3c04e670 100755 --- a/tests/crypt/login.defs_SHA256-round-max/01_chpasswd.test +++ b/tests/crypt/login.defs_SHA256-round-max/01_chpasswd.test @@ -21,10 +21,10 @@ echo nobody:test | chpasswd echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl 01_chpasswd/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl 01_chpasswd/group /etc/group +../../common/compare_file.pl config/etc/group /etc/group echo "OK" echo -n "Check the shadow file..." ../../common/compare_file.pl 01_chpasswd/shadow /etc/shadow @@ -36,7 +36,7 @@ grep -q '^nobody:\$5\$rounds=7000\$' /etc/shadow || { } echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl 01_chpasswd/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/group b/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/group deleted file mode 100644 index 10123908..00000000 --- a/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/passwd b/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd.test b/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd.test new file mode 100755 index 00000000..51adcbe8 --- /dev/null +++ b/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd.test @@ -0,0 +1,45 @@ +#!/bin/sh + +set -e + +cd $(dirname $0) + +. ../../common/config.sh +. ../../common/log.sh + +log_start "$0" "Add a new user" + +save_config + +# restore the files on exit +trap 'log_status "$0" "FAILURE"; restore_config' 0 + +change_config + +echo -n "echo nogroup:test | chgpasswd..." +echo nogroup:test | chgpasswd +echo "OK" + +echo -n "Check the passwd file..." +../../common/compare_file.pl config/etc/passwd /etc/passwd +echo "OK" +echo -n "Check the group file..." +../../common/compare_file.pl config/etc/group /etc/group +echo "OK" +echo -n "Check the shadow file..." +../../common/compare_file.pl config/etc/shadow /etc/shadow +echo "OK" +echo -n "Check the gshadow file..." +../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow +echo "OK" +echo -n "Check the number of rounds..." +grep -q '^nogroup:\$5\$rounds=7000\$' /etc/gshadow || { + grep "^nogroup:" /etc/gshadow + exit 1 +} +echo "OK" + +log_status "$0" "SUCCESS" +restore_config +trap '' 0 + diff --git a/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/gshadow b/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/gshadow similarity index 93% rename from tests/crypt/login.defs_SHA256-round-min/01_chpasswd/gshadow rename to tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/gshadow index ae424865..f2355849 100644 --- a/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/gshadow +++ b/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/gshadow @@ -36,6 +36,6 @@ plugdev:*:: staff:*:: games:*:: users:*:: -nogroup:*:: +nogroup:@PASS_SHA256 test@:: crontab:x:: Debian-exim:x:: diff --git a/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd.test b/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd.test index 2abebbd4..ba6d6f21 100755 --- a/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd.test +++ b/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd.test @@ -21,10 +21,10 @@ echo nobody:test | chpasswd echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl 01_chpasswd/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl 01_chpasswd/group /etc/group +../../common/compare_file.pl config/etc/group /etc/group echo "OK" echo -n "Check the shadow file..." ../../common/compare_file.pl 01_chpasswd/shadow /etc/shadow @@ -39,7 +39,7 @@ if [ "$rounds1" -lt 3000 ] || [ "$rounds1" -gt 10000 ]; then fi echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl 01_chpasswd/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" echo "" diff --git a/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/group b/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/group deleted file mode 100644 index 10123908..00000000 --- a/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/passwd b/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd.test b/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd.test new file mode 100755 index 00000000..f730d510 --- /dev/null +++ b/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd.test @@ -0,0 +1,64 @@ +#!/bin/sh + +set -e + +cd $(dirname $0) + +. ../../common/config.sh +. ../../common/log.sh + +log_start "$0" "Change a group's password with chgpasswd" + +save_config + +# restore the files on exit +trap 'log_status "$0" "FAILURE"; restore_config' 0 + +change_config + +echo -n "Change group nogroup's password (echo nogroup:test | chgpasswd)..." +echo nogroup:test | chgpasswd +echo "OK" + +echo -n "Check the passwd file..." +../../common/compare_file.pl config/etc/passwd /etc/passwd +echo "OK" +echo -n "Check the group file..." +../../common/compare_file.pl config/etc/group /etc/group +echo "OK" +echo -n "Check the shadow file..." +../../common/compare_file.pl config/etc/shadow /etc/shadow +echo "OK" +echo -n "Check the gshadow file..." +../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow +echo "OK" +echo -n "Check the number of rounds..." +rounds1=$(sed -n 's/^nogroup:\$5\$rounds=\([0-9]*\)\$.*$/\1/p' /etc/gshadow) +echo -n "($rounds1)..." +if [ "$rounds1" -lt 3000 ] || [ "$rounds1" -gt 10000 ]; then + echo "Wrong rounds: $rounds1" + grep "^nogroup:" /etc/gshadow + exit 1 +fi +echo "OK" + +echo "" +echo "Make sure the number of rounds is not constant" + +echo -n " Change group nogroup's password (echo nogroup:test | chgpasswd)..." +echo nogroup:test | chgpasswd +echo "OK" + +rounds2=$(sed -n 's/^nogroup:\$5\$rounds=\([0-9]*\)\$.*$/\1/p' /etc/gshadow) +if [ "$rounds1" = "$rounds2" ]; then + echo "The number of rounds did not change." + echo "It may not be a error, please re-run this test." + exit 1 +fi +echo -n "($rounds2)..." +echo "OK" + +log_status "$0" "SUCCESS" +restore_config +trap '' 0 + diff --git a/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/gshadow b/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/gshadow new file mode 100644 index 00000000..f2355849 --- /dev/null +++ b/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/gshadow @@ -0,0 +1,41 @@ +root:*:: +daemon:*:: +bin:*:: +sys:*:: +adm:*:: +tty:*:: +disk:*:: +lp:*:: +mail:*:: +news:*:: +uucp:*:: +man:*:: +proxy:*:: +kmem:*:: +dialout:*:: +fax:*:: +voice:*:: +cdrom:*:: +floppy:*:: +tape:*:: +sudo:*:: +audio:*:: +dip:*:: +www-data:*:: +backup:*:: +operator:*:: +list:*:: +irc:*:: +src:*:: +gnats:*:: +shadow:*:: +utmp:*:: +video:*:: +sasl:*:: +plugdev:*:: +staff:*:: +games:*:: +users:*:: +nogroup:@PASS_SHA256 test@:: +crontab:x:: +Debian-exim:x:: diff --git a/tests/crypt/login.defs_SHA256-round-min/01_chpasswd.test b/tests/crypt/login.defs_SHA256-round-min/01_chpasswd.test index 433bf60a..8a445e78 100755 --- a/tests/crypt/login.defs_SHA256-round-min/01_chpasswd.test +++ b/tests/crypt/login.defs_SHA256-round-min/01_chpasswd.test @@ -21,10 +21,10 @@ echo nobody:test | chpasswd echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl 01_chpasswd/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl 01_chpasswd/group /etc/group +../../common/compare_file.pl config/etc/group /etc/group echo "OK" echo -n "Check the shadow file..." ../../common/compare_file.pl 01_chpasswd/shadow /etc/shadow @@ -36,7 +36,7 @@ grep -q '^nobody:\$5\$rounds=2000\$' /etc/shadow || { } echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl 01_chpasswd/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/group b/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/group deleted file mode 100644 index 10123908..00000000 --- a/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/passwd b/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd.test b/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd.test new file mode 100755 index 00000000..bbbac5b6 --- /dev/null +++ b/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd.test @@ -0,0 +1,45 @@ +#!/bin/sh + +set -e + +cd $(dirname $0) + +. ../../common/config.sh +. ../../common/log.sh + +log_start "$0" "Changea group password" + +save_config + +# restore the files on exit +trap 'log_status "$0" "FAILURE"; restore_config' 0 + +change_config + +echo -n "echo nogroup:test | chgpasswd..." +echo nogroup:test | chgpasswd +echo "OK" + +echo -n "Check the passwd file..." +../../common/compare_file.pl config/etc/passwd /etc/passwd +echo "OK" +echo -n "Check the group file..." +../../common/compare_file.pl config/etc/group /etc/group +echo "OK" +echo -n "Check the shadow file..." +../../common/compare_file.pl config/etc/shadow /etc/shadow +echo "OK" +echo -n "Check the gshadow file..." +../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow +echo "OK" +echo -n "Check the number of rounds..." +grep -q '^nogroup:\$5\$rounds=2000\$' /etc/gshadow || { + grep "^nogroup:" /etc/gshadow + exit 1 +} +echo "OK" + +log_status "$0" "SUCCESS" +restore_config +trap '' 0 + diff --git a/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/gshadow b/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/gshadow new file mode 100644 index 00000000..f2355849 --- /dev/null +++ b/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/gshadow @@ -0,0 +1,41 @@ +root:*:: +daemon:*:: +bin:*:: +sys:*:: +adm:*:: +tty:*:: +disk:*:: +lp:*:: +mail:*:: +news:*:: +uucp:*:: +man:*:: +proxy:*:: +kmem:*:: +dialout:*:: +fax:*:: +voice:*:: +cdrom:*:: +floppy:*:: +tape:*:: +sudo:*:: +audio:*:: +dip:*:: +www-data:*:: +backup:*:: +operator:*:: +list:*:: +irc:*:: +src:*:: +gnats:*:: +shadow:*:: +utmp:*:: +video:*:: +sasl:*:: +plugdev:*:: +staff:*:: +games:*:: +users:*:: +nogroup:@PASS_SHA256 test@:: +crontab:x:: +Debian-exim:x:: diff --git a/tests/crypt/login.defs_SHA256/01_chpasswd.test b/tests/crypt/login.defs_SHA256/01_chpasswd.test index d5835170..28ee58ff 100755 --- a/tests/crypt/login.defs_SHA256/01_chpasswd.test +++ b/tests/crypt/login.defs_SHA256/01_chpasswd.test @@ -21,16 +21,16 @@ echo nobody:test | chpasswd echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl 01_chpasswd/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl 01_chpasswd/group /etc/group +../../common/compare_file.pl config/etc/group /etc/group echo "OK" echo -n "Check the shadow file..." ../../common/compare_file.pl 01_chpasswd/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl 01_chpasswd/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/crypt/login.defs_SHA256/01_chpasswd/group b/tests/crypt/login.defs_SHA256/01_chpasswd/group deleted file mode 100644 index 10123908..00000000 --- a/tests/crypt/login.defs_SHA256/01_chpasswd/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/crypt/login.defs_SHA256/01_chpasswd/gshadow b/tests/crypt/login.defs_SHA256/01_chpasswd/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/crypt/login.defs_SHA256/01_chpasswd/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/crypt/login.defs_SHA256/01_chpasswd/passwd b/tests/crypt/login.defs_SHA256/01_chpasswd/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/crypt/login.defs_SHA256/01_chpasswd/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/crypt/login.defs_SHA256/02_chgpasswd.test b/tests/crypt/login.defs_SHA256/02_chgpasswd.test new file mode 100755 index 00000000..a38a669c --- /dev/null +++ b/tests/crypt/login.defs_SHA256/02_chgpasswd.test @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +cd $(dirname $0) + +. ../../common/config.sh +. ../../common/log.sh + +log_start "$0" "Change a group password" + +save_config + +# restore the files on exit +trap 'log_status "$0" "FAILURE"; restore_config' 0 + +change_config + +echo -n "echo nogroup:test | chgpasswd..." +echo nogroup:test | chgpasswd +echo "OK" + +echo -n "Check the passwd file..." +../../common/compare_file.pl config/etc/passwd /etc/passwd +echo "OK" +echo -n "Check the group file..." +../../common/compare_file.pl config/etc/group /etc/group +echo "OK" +echo -n "Check the shadow file..." +../../common/compare_file.pl config/etc/shadow /etc/shadow +echo "OK" +echo -n "Check the gshadow file..." +../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow +echo "OK" + +log_status "$0" "SUCCESS" +restore_config +trap '' 0 + diff --git a/tests/crypt/login.defs_SHA256/02_chgpasswd/gshadow b/tests/crypt/login.defs_SHA256/02_chgpasswd/gshadow new file mode 100644 index 00000000..f2355849 --- /dev/null +++ b/tests/crypt/login.defs_SHA256/02_chgpasswd/gshadow @@ -0,0 +1,41 @@ +root:*:: +daemon:*:: +bin:*:: +sys:*:: +adm:*:: +tty:*:: +disk:*:: +lp:*:: +mail:*:: +news:*:: +uucp:*:: +man:*:: +proxy:*:: +kmem:*:: +dialout:*:: +fax:*:: +voice:*:: +cdrom:*:: +floppy:*:: +tape:*:: +sudo:*:: +audio:*:: +dip:*:: +www-data:*:: +backup:*:: +operator:*:: +list:*:: +irc:*:: +src:*:: +gnats:*:: +shadow:*:: +utmp:*:: +video:*:: +sasl:*:: +plugdev:*:: +staff:*:: +games:*:: +users:*:: +nogroup:@PASS_SHA256 test@:: +crontab:x:: +Debian-exim:x:: diff --git a/tests/crypt/login.defs_SHA512/01_chpasswd.test b/tests/crypt/login.defs_SHA512/01_chpasswd.test index d5835170..28ee58ff 100755 --- a/tests/crypt/login.defs_SHA512/01_chpasswd.test +++ b/tests/crypt/login.defs_SHA512/01_chpasswd.test @@ -21,16 +21,16 @@ echo nobody:test | chpasswd echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl 01_chpasswd/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl 01_chpasswd/group /etc/group +../../common/compare_file.pl config/etc/group /etc/group echo "OK" echo -n "Check the shadow file..." ../../common/compare_file.pl 01_chpasswd/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl 01_chpasswd/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/crypt/login.defs_SHA512/01_chpasswd/group b/tests/crypt/login.defs_SHA512/01_chpasswd/group deleted file mode 100644 index 10123908..00000000 --- a/tests/crypt/login.defs_SHA512/01_chpasswd/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/crypt/login.defs_SHA512/01_chpasswd/gshadow b/tests/crypt/login.defs_SHA512/01_chpasswd/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/crypt/login.defs_SHA512/01_chpasswd/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/crypt/login.defs_SHA512/01_chpasswd/passwd b/tests/crypt/login.defs_SHA512/01_chpasswd/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/crypt/login.defs_SHA512/01_chpasswd/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/crypt/login.defs_SHA512/02_chgpasswd.test b/tests/crypt/login.defs_SHA512/02_chgpasswd.test new file mode 100755 index 00000000..b7ac2884 --- /dev/null +++ b/tests/crypt/login.defs_SHA512/02_chgpasswd.test @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +cd $(dirname $0) + +. ../../common/config.sh +. ../../common/log.sh + +log_start "$0" "Change a group's password with chgpasswd" + +save_config + +# restore the files on exit +trap 'log_status "$0" "FAILURE"; restore_config' 0 + +change_config + +echo -n "echo nogroup:test | chgpasswd..." +echo nogroup:test | chgpasswd +echo "OK" + +echo -n "Check the passwd file..." +../../common/compare_file.pl config/etc/passwd /etc/passwd +echo "OK" +echo -n "Check the group file..." +../../common/compare_file.pl config/etc/group /etc/group +echo "OK" +echo -n "Check the shadow file..." +../../common/compare_file.pl config/etc/shadow /etc/shadow +echo "OK" +echo -n "Check the gshadow file..." +../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow +echo "OK" + +log_status "$0" "SUCCESS" +restore_config +trap '' 0 + diff --git a/tests/crypt/login.defs_SHA512/02_chgpasswd/gshadow b/tests/crypt/login.defs_SHA512/02_chgpasswd/gshadow new file mode 100644 index 00000000..5c8c33ad --- /dev/null +++ b/tests/crypt/login.defs_SHA512/02_chgpasswd/gshadow @@ -0,0 +1,41 @@ +root:*:: +daemon:*:: +bin:*:: +sys:*:: +adm:*:: +tty:*:: +disk:*:: +lp:*:: +mail:*:: +news:*:: +uucp:*:: +man:*:: +proxy:*:: +kmem:*:: +dialout:*:: +fax:*:: +voice:*:: +cdrom:*:: +floppy:*:: +tape:*:: +sudo:*:: +audio:*:: +dip:*:: +www-data:*:: +backup:*:: +operator:*:: +list:*:: +irc:*:: +src:*:: +gnats:*:: +shadow:*:: +utmp:*:: +video:*:: +sasl:*:: +plugdev:*:: +staff:*:: +games:*:: +users:*:: +nogroup:@PASS_SHA512 test@:: +crontab:x:: +Debian-exim:x:: diff --git a/tests/crypt/login.defs_none/01_chpasswd.test b/tests/crypt/login.defs_none/01_chpasswd.test index d5835170..28ee58ff 100755 --- a/tests/crypt/login.defs_none/01_chpasswd.test +++ b/tests/crypt/login.defs_none/01_chpasswd.test @@ -21,16 +21,16 @@ echo nobody:test | chpasswd echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl 01_chpasswd/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl 01_chpasswd/group /etc/group +../../common/compare_file.pl config/etc/group /etc/group echo "OK" echo -n "Check the shadow file..." ../../common/compare_file.pl 01_chpasswd/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl 01_chpasswd/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/crypt/login.defs_none/01_chpasswd/group b/tests/crypt/login.defs_none/01_chpasswd/group deleted file mode 100644 index 10123908..00000000 --- a/tests/crypt/login.defs_none/01_chpasswd/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/crypt/login.defs_none/01_chpasswd/gshadow b/tests/crypt/login.defs_none/01_chpasswd/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/crypt/login.defs_none/01_chpasswd/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/crypt/login.defs_none/01_chpasswd/passwd b/tests/crypt/login.defs_none/01_chpasswd/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/crypt/login.defs_none/01_chpasswd/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/crypt/login.defs_none/02_chgpasswd.test b/tests/crypt/login.defs_none/02_chgpasswd.test new file mode 100755 index 00000000..b7ac2884 --- /dev/null +++ b/tests/crypt/login.defs_none/02_chgpasswd.test @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +cd $(dirname $0) + +. ../../common/config.sh +. ../../common/log.sh + +log_start "$0" "Change a group's password with chgpasswd" + +save_config + +# restore the files on exit +trap 'log_status "$0" "FAILURE"; restore_config' 0 + +change_config + +echo -n "echo nogroup:test | chgpasswd..." +echo nogroup:test | chgpasswd +echo "OK" + +echo -n "Check the passwd file..." +../../common/compare_file.pl config/etc/passwd /etc/passwd +echo "OK" +echo -n "Check the group file..." +../../common/compare_file.pl config/etc/group /etc/group +echo "OK" +echo -n "Check the shadow file..." +../../common/compare_file.pl config/etc/shadow /etc/shadow +echo "OK" +echo -n "Check the gshadow file..." +../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow +echo "OK" + +log_status "$0" "SUCCESS" +restore_config +trap '' 0 + diff --git a/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/gshadow b/tests/crypt/login.defs_none/02_chgpasswd/gshadow similarity index 93% rename from tests/crypt/login.defs_SHA256-round-max/01_chpasswd/gshadow rename to tests/crypt/login.defs_none/02_chgpasswd/gshadow index ae424865..53dba5eb 100644 --- a/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/gshadow +++ b/tests/crypt/login.defs_none/02_chgpasswd/gshadow @@ -36,6 +36,6 @@ plugdev:*:: staff:*:: games:*:: users:*:: -nogroup:*:: +nogroup:@PASS_DES test@:: crontab:x:: Debian-exim:x::