From: sgakerru Date: Tue, 11 Nov 2025 20:22:41 +0000 (+0400) Subject: useradd: tests for supplements groups X-Git-Tag: 4.19.0-rc1~89 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6134359b288de4e9589b7d28f375864f729a589a;p=thirdparty%2Fshadow.git useradd: tests for supplements groups For regular and system user cases --- diff --git a/tests/run_all b/tests/run_all index 584e1bd34..36ddd4def 100755 --- a/tests/run_all +++ b/tests/run_all @@ -772,6 +772,8 @@ run_test ./usertools/useradd/65_useradd_locked_group/useradd.test run_test ./usertools/useradd/66_useradd_locked_shadow/useradd.test run_test ./usertools/useradd/67_useradd_locked_gshadow/useradd.test run_test ./usertools/useradd/68_useradd-s_empty/useradd.test +run_test ./usertools/useradd/69_useradd_default_GROUPS_name/useradd.test +run_test ./usertools/useradd/70_useradd-r_default_GROUPS_name/useradd.test run_test ./usertools/userdel/01_userdel_usage/userdel.test run_test ./usertools/userdel/02_userdel_usage_invalid_option/userdel.test run_test ./usertools/userdel/03_userdel_usage_no_users/userdel.test diff --git a/tests/run_all.coverage b/tests/run_all.coverage index 94fe7fa4f..87a517e0b 100755 --- a/tests/run_all.coverage +++ b/tests/run_all.coverage @@ -788,6 +788,8 @@ run_test ./usertools/useradd/65_useradd_locked_group/useradd.test run_test ./usertools/useradd/66_useradd_locked_shadow/useradd.test run_test ./usertools/useradd/67_useradd_locked_gshadow/useradd.test run_test ./usertools/useradd/68_useradd-s_empty/useradd.test +run_test ./usertools/useradd/69_useradd_default_GROUPS_name/useradd.test +run_test ./usertools/useradd/70_useradd-r_default_GROUPS_name/useradd.test run_test ./usertools/userdel/01_userdel_usage/userdel.test run_test ./usertools/userdel/02_userdel_usage_invalid_option/userdel.test run_test ./usertools/userdel/03_userdel_usage_no_users/userdel.test diff --git a/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/config.txt b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/config.txt new file mode 100644 index 000000000..4909c6cba --- /dev/null +++ b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/config.txt @@ -0,0 +1,5 @@ +# no testsuite password +# root password: rootF00barbaz +# myuser password: myuserF00barbaz + +user foo diff --git a/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/config/etc/default/useradd b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/config/etc/default/useradd new file mode 100644 index 000000000..9e75e5433 --- /dev/null +++ b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/config/etc/default/useradd @@ -0,0 +1,40 @@ +# Default values for useradd(8) +# +# The SHELL variable specifies the default login shell on your +# system. +# Similar to DHSELL in adduser. However, we use "sh" here because +# useradd is a low level utility and should be as general +# as possible +SHELL=/bin/foobar +# +# The default group for users +# 100=users on Debian systems +# Same as USERS_GID in adduser +# This argument is used when the -n flag is specified. +# The default behavior (when -n and -g are not specified) is to create a +# primary user group with the same name as the user being added to the +# system. +GROUP=10 +# +# Addional supplementary groups for users +GROUPS=bin,adm,man,cdrom +# +# The default home directory. Same as DHOME for adduser +# +HOME=/tmp +# +# The number of days after a password expires until the account +# is permanently disabled +INACTIVE=12 +# +# The default expire date +EXPIRE=2007-12-02 +# +# The SKEL variable specifies the directory containing "skeletal" user +# files; in other words, files such as a sample .profile that will be +# copied to the new user's home directory when it is created. +# SKEL=/etc/skel +# +# Defines whether the mail spool should be created while +# creating the account +# CREATE_MAIL_SPOOL=yes diff --git a/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/config/etc/group b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/config/etc/group new file mode 100644 index 000000000..101239088 --- /dev/null +++ b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/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/usertools/useradd/70_useradd-r_default_GROUPS_name/config/etc/gshadow b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/config/etc/gshadow new file mode 100644 index 000000000..ae4248659 --- /dev/null +++ b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/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/usertools/useradd/70_useradd-r_default_GROUPS_name/config/etc/passwd b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/config/etc/passwd new file mode 100644 index 000000000..43fc135a4 --- /dev/null +++ b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/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/usertools/useradd/70_useradd-r_default_GROUPS_name/config/etc/shadow b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/config/etc/shadow new file mode 100644 index 000000000..5f50d1873 --- /dev/null +++ b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/config/etc/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/usertools/useradd/70_useradd-r_default_GROUPS_name/data/group b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/data/group new file mode 100644 index 000000000..b5b6ce2f5 --- /dev/null +++ b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/data/group @@ -0,0 +1,42 @@ +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: +foo:x:999: diff --git a/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/data/gshadow b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/data/gshadow new file mode 100644 index 000000000..bfc067537 --- /dev/null +++ b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/data/gshadow @@ -0,0 +1,42 @@ +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:: +foo:!:: diff --git a/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/data/passwd b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/data/passwd new file mode 100644 index 000000000..640a0cccc --- /dev/null +++ b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/data/passwd @@ -0,0 +1,20 @@ +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 +foo:x:101:999::/tmp/foo:/bin/foobar diff --git a/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/data/shadow b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/data/shadow new file mode 100644 index 000000000..823c4c05a --- /dev/null +++ b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/data/shadow @@ -0,0 +1,20 @@ +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::: +foo:!:@TODAY@:::::: diff --git a/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/useradd.test b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/useradd.test new file mode 100755 index 000000000..835c1eeb4 --- /dev/null +++ b/tests/usertools/useradd/70_useradd-r_default_GROUPS_name/useradd.test @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +cd "$(dirname $0)" + +. ../../../common/config.sh +. ../../../common/log.sh + +log_start "$0" "useradd ignores supplementary groups from GROUPS field in /etc/default/useradd for system user" + +save_config + +# restore the files on exit +trap 'log_status "$0" "FAILURE"; restore_config' 0 + +change_config + +printf "Create system user foo, without group associations with bin,adm,man,cdrom..." +useradd -r foo +printf "OK\n" + +printf "Check the passwd file..." +../../../common/compare_file.pl data/passwd /etc/passwd +printf "OK\n" +printf "Check the group file..." +../../../common/compare_file.pl data/group /etc/group +printf "OK\n" +printf "Check the shadow file..." +../../../common/compare_file.pl data/shadow /etc/shadow +printf "OK\n" +printf "Check the gshadow file..." +../../../common/compare_file.pl data/gshadow /etc/gshadow +printf "OK\n" + +log_status "$0" "SUCCESS" +restore_config +trap '' 0 +