From fa2b2e905d7db0d69c66a77016014138154391c3 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Mon, 11 Feb 2008 22:10:07 +0000 Subject: [PATCH] Added new newuser test: newusers fails if the groupname is invalid. --- .../config.txt | 0 .../config/etc/group | 41 ++++++++++++++ .../config/etc/gshadow | 41 ++++++++++++++ .../config/etc/passwd | 19 +++++++ .../config/etc/shadow | 19 +++++++ .../data/group | 41 ++++++++++++++ .../data/gshadow | 41 ++++++++++++++ .../data/newusers.err | 3 ++ .../data/newusers.list | 1 + .../data/passwd | 19 +++++++ .../data/shadow | 19 +++++++ .../newusers.test | 54 +++++++++++++++++++ tests/run_all | 1 + 13 files changed, 299 insertions(+) create mode 100644 tests/newusers/28_create_user_error_invalid_groupname/config.txt create mode 100644 tests/newusers/28_create_user_error_invalid_groupname/config/etc/group create mode 100644 tests/newusers/28_create_user_error_invalid_groupname/config/etc/gshadow create mode 100644 tests/newusers/28_create_user_error_invalid_groupname/config/etc/passwd create mode 100644 tests/newusers/28_create_user_error_invalid_groupname/config/etc/shadow create mode 100644 tests/newusers/28_create_user_error_invalid_groupname/data/group create mode 100644 tests/newusers/28_create_user_error_invalid_groupname/data/gshadow create mode 100644 tests/newusers/28_create_user_error_invalid_groupname/data/newusers.err create mode 100644 tests/newusers/28_create_user_error_invalid_groupname/data/newusers.list create mode 100644 tests/newusers/28_create_user_error_invalid_groupname/data/passwd create mode 100644 tests/newusers/28_create_user_error_invalid_groupname/data/shadow create mode 100755 tests/newusers/28_create_user_error_invalid_groupname/newusers.test diff --git a/tests/newusers/28_create_user_error_invalid_groupname/config.txt b/tests/newusers/28_create_user_error_invalid_groupname/config.txt new file mode 100644 index 00000000..e69de29b diff --git a/tests/newusers/28_create_user_error_invalid_groupname/config/etc/group b/tests/newusers/28_create_user_error_invalid_groupname/config/etc/group new file mode 100644 index 00000000..10123908 --- /dev/null +++ b/tests/newusers/28_create_user_error_invalid_groupname/config/etc/group @@ -0,0 +1,41 @@ +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/newusers/28_create_user_error_invalid_groupname/config/etc/gshadow b/tests/newusers/28_create_user_error_invalid_groupname/config/etc/gshadow new file mode 100644 index 00000000..ae424865 --- /dev/null +++ b/tests/newusers/28_create_user_error_invalid_groupname/config/etc/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:*:: +crontab:x:: +Debian-exim:x:: diff --git a/tests/newusers/28_create_user_error_invalid_groupname/config/etc/passwd b/tests/newusers/28_create_user_error_invalid_groupname/config/etc/passwd new file mode 100644 index 00000000..43fc135a --- /dev/null +++ b/tests/newusers/28_create_user_error_invalid_groupname/config/etc/passwd @@ -0,0 +1,19 @@ +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/newusers/28_create_user_error_invalid_groupname/config/etc/shadow b/tests/newusers/28_create_user_error_invalid_groupname/config/etc/shadow new file mode 100644 index 00000000..031ce889 --- /dev/null +++ b/tests/newusers/28_create_user_error_invalid_groupname/config/etc/shadow @@ -0,0 +1,19 @@ +root::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/newusers/28_create_user_error_invalid_groupname/data/group b/tests/newusers/28_create_user_error_invalid_groupname/data/group new file mode 100644 index 00000000..10123908 --- /dev/null +++ b/tests/newusers/28_create_user_error_invalid_groupname/data/group @@ -0,0 +1,41 @@ +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/newusers/28_create_user_error_invalid_groupname/data/gshadow b/tests/newusers/28_create_user_error_invalid_groupname/data/gshadow new file mode 100644 index 00000000..ae424865 --- /dev/null +++ b/tests/newusers/28_create_user_error_invalid_groupname/data/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:*:: +crontab:x:: +Debian-exim:x:: diff --git a/tests/newusers/28_create_user_error_invalid_groupname/data/newusers.err b/tests/newusers/28_create_user_error_invalid_groupname/data/newusers.err new file mode 100644 index 00000000..ea72726d --- /dev/null +++ b/tests/newusers/28_create_user_error_invalid_groupname/data/newusers.err @@ -0,0 +1,3 @@ +newusers: invalid group name `f o o' +newusers: line 1: can't create group +newusers: error detected, changes ignored diff --git a/tests/newusers/28_create_user_error_invalid_groupname/data/newusers.list b/tests/newusers/28_create_user_error_invalid_groupname/data/newusers.list new file mode 100644 index 00000000..f57cf94c --- /dev/null +++ b/tests/newusers/28_create_user_error_invalid_groupname/data/newusers.list @@ -0,0 +1 @@ +foo:fooPass::f o o:User Foo - Gecos Field::/bin/sh diff --git a/tests/newusers/28_create_user_error_invalid_groupname/data/passwd b/tests/newusers/28_create_user_error_invalid_groupname/data/passwd new file mode 100644 index 00000000..43fc135a --- /dev/null +++ b/tests/newusers/28_create_user_error_invalid_groupname/data/passwd @@ -0,0 +1,19 @@ +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/newusers/28_create_user_error_invalid_groupname/data/shadow b/tests/newusers/28_create_user_error_invalid_groupname/data/shadow new file mode 100644 index 00000000..031ce889 --- /dev/null +++ b/tests/newusers/28_create_user_error_invalid_groupname/data/shadow @@ -0,0 +1,19 @@ +root::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/newusers/28_create_user_error_invalid_groupname/newusers.test b/tests/newusers/28_create_user_error_invalid_groupname/newusers.test new file mode 100755 index 00000000..915f8f79 --- /dev/null +++ b/tests/newusers/28_create_user_error_invalid_groupname/newusers.test @@ -0,0 +1,54 @@ +#!/bin/sh + +set -e + +cd $(dirname $0) + +. ../../common/config.sh +. ../../common/log.sh + +log_start "$0" "newusers fails if the groupname is invalid" + +save_config + +# restore the files on exit +trap 'log_status "$0" "FAILURE"; restore_config' 0 + +change_config + +echo -n "Creating the users..." +newusers data/newusers.list 2>tmp/newusers.err && exit 1 || { + status=$? +} +echo "OK" + +echo -n "Check returned status..." +test "$status" = "1" +echo "OK" + +echo "newusers reported:" +echo "=======================================================================" +cat tmp/newusers.err +echo "=======================================================================" +echo -n "Check that there were a failure message..." +diff -au data/newusers.err tmp/newusers.err +echo "error message OK." +rm -f tmp/newusers.err + +echo -n "Check the passwd file..." +../../common/compare_file.pl data/passwd /etc/passwd +echo "OK" +echo -n "Check the group file..." +../../common/compare_file.pl data/group /etc/group +echo "OK" +echo -n "Check the shadow file..." +../../common/compare_file.pl data/shadow /etc/shadow +echo "OK" +echo -n "Check the gshadow file..." +../../common/compare_file.pl data/gshadow /etc/gshadow +echo "OK" + +log_status "$0" "SUCCESS" +restore_config +trap '' 0 + diff --git a/tests/run_all b/tests/run_all index 228407f6..4393063a 100755 --- a/tests/run_all +++ b/tests/run_all @@ -195,6 +195,7 @@ run_test ./newusers/24_create_user_error_invalid_UID/newusers.test run_test ./newusers/25_create_user_error_no_remaining_UID/newusers.test run_test ./newusers/26_create_user_error_no_remaining_GID/newusers.test run_test ./newusers/27_create_user_error_invalid_username/newusers.test +run_test ./newusers/28_create_user_error_invalid_groupname/newusers.test echo echo "$succeded test(s) passed"