From 42e7794740f3037d831043846a20a5fce4125631 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Thu, 2 Oct 2014 19:53:37 +0000 Subject: - Add a test for bug 191427 where pw(8) will go into an infinite loop Reviewed by: will MFC after: 1 month --- pw/tests/pw_delete.sh | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100755 pw/tests/pw_delete.sh (limited to 'pw/tests/pw_delete.sh') diff --git a/pw/tests/pw_delete.sh b/pw/tests/pw_delete.sh new file mode 100755 index 0000000..0636629 --- /dev/null +++ b/pw/tests/pw_delete.sh @@ -0,0 +1,24 @@ +# $FreeBSD$ + +# Import helper functions +. $(atf_get_srcdir)/helper_functions.shin + +# Test that a user can be deleted when another user is part of this +# user's default group and does not go into an infinate loop. +# PR: 191427 +atf_test_case rmuser_seperate_group cleanup +rmuser_seperate_group_head() { + atf_set "timeout" "30" +} +rmuser_seperate_group_body() { + populate_etc_skel + pw -V ${HOME} useradd test || atf_fail "Creating test user" + pw -V ${HOME} groupmod test -M 'test,root' || \ + atf_fail "Modifying the group" + pw -V ${HOME} userdel test || atf_fail "delete the user" +} + + +atf_init_test_cases() { + atf_add_test_case rmuser_seperate_group +} -- cgit v1.2.3-56-ge451 From 85717372d65dd2fe05ea2b086c24f03cbe7d1206 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Tue, 28 Oct 2014 14:54:04 +0000 Subject: Do not delete the group wheel when bad argument is passed to pw groupdel -g Check that the -g argument is actually a number, if not report an error. This argument is converted without checking with atoi(3) later so without this check it converts any alpha entries into 0 meaning it deletes the group wheel Add a regression test about it PR: 90114 Reported by: bkoenig@cs.tu-berlin.de MFC after: 1 week --- pw/pw_group.c | 5 +++++ pw/tests/pw_delete.sh | 12 ++++++++++++ 2 files changed, 17 insertions(+) (limited to 'pw/tests/pw_delete.sh') diff --git a/pw/pw_group.c b/pw/pw_group.c index 4ed6ea9..b20ce88 100644 --- a/pw/pw_group.c +++ b/pw/pw_group.c @@ -67,6 +67,11 @@ pw_group(struct userconf * cnf, int mode, struct cargs * args) NULL }; + if (a_gid != NULL) { + if (strspn(a_gid->val, "0123456789") != strlen(a_gid->val)) + errx(EX_USAGE, "-g expects a number"); + } + if (mode == M_LOCK || mode == M_UNLOCK) errx(EX_USAGE, "'lock' command is not available for groups"); diff --git a/pw/tests/pw_delete.sh b/pw/tests/pw_delete.sh index 0636629..6ebbf24 100755 --- a/pw/tests/pw_delete.sh +++ b/pw/tests/pw_delete.sh @@ -18,7 +18,19 @@ rmuser_seperate_group_body() { pw -V ${HOME} userdel test || atf_fail "delete the user" } +atf_test_case group_do_not_delete_wheel_if_group_unkown +group_do_not_delete_wheel_if_group_unkown_head() { + atf_set "descr" "Make sure we do not consider as gid 0 an unknown group" +} + +group_do_not_delete_wheel_if_group_unkown_body() { + populate_etc_skel + atf_check -s exit:0 -o inline:"wheel:*:0:root\n" -x pw -V ${HOME} groupshow wheel + atf_check -e inline:"pw: -g expects a number\n" -s exit:64 -x pw -V ${HOME} groupdel -g I_do_not_exist + atf_check -s exit:0 -o "wheel:*:0:root\n" -x pw -V ${HOME} groupshow wheel +} atf_init_test_cases() { atf_add_test_case rmuser_seperate_group + atf_add_test_case group_do_not_delete_wheel_if_group_unkown } -- cgit v1.2.3-56-ge451 From 1f6950b26c668b108ded74fdea09aaf5f8abaeb8 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Tue, 28 Oct 2014 15:33:15 +0000 Subject: Fix atf syntax --- pw/tests/pw_delete.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pw/tests/pw_delete.sh') diff --git a/pw/tests/pw_delete.sh b/pw/tests/pw_delete.sh index 6ebbf24..84a39db 100755 --- a/pw/tests/pw_delete.sh +++ b/pw/tests/pw_delete.sh @@ -27,7 +27,7 @@ group_do_not_delete_wheel_if_group_unkown_body() { populate_etc_skel atf_check -s exit:0 -o inline:"wheel:*:0:root\n" -x pw -V ${HOME} groupshow wheel atf_check -e inline:"pw: -g expects a number\n" -s exit:64 -x pw -V ${HOME} groupdel -g I_do_not_exist - atf_check -s exit:0 -o "wheel:*:0:root\n" -x pw -V ${HOME} groupshow wheel + atf_check -s exit:0 -o inline:"wheel:*:0:root\n" -x pw -V ${HOME} groupshow wheel } atf_init_test_cases() { -- cgit v1.2.3-56-ge451 From 3dbd5cfb7b9eec912c68ae204ea36bec869b48cd Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Tue, 28 Oct 2014 15:46:22 +0000 Subject: Ensure pw userdel -u do not try to remove root Check the uid passed is actually a number as early as possible MFC after: 1 week --- pw/pw_user.c | 3 +++ pw/tests/pw_delete.sh | 11 +++++++++++ 2 files changed, 14 insertions(+) (limited to 'pw/tests/pw_delete.sh') diff --git a/pw/pw_user.c b/pw/pw_user.c index 0b56b81..483148a 100644 --- a/pw/pw_user.c +++ b/pw/pw_user.c @@ -321,6 +321,9 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args) (a_uid = a_name)->ch = 'u'; a_name = NULL; } + } else { + if (strspn(a_uid->val, "0123456789") != strlen(a_uid->val)) + errx(EX_USAGE, "-u expects a number"); } /* diff --git a/pw/tests/pw_delete.sh b/pw/tests/pw_delete.sh index 84a39db..0e97939 100755 --- a/pw/tests/pw_delete.sh +++ b/pw/tests/pw_delete.sh @@ -30,7 +30,18 @@ group_do_not_delete_wheel_if_group_unkown_body() { atf_check -s exit:0 -o inline:"wheel:*:0:root\n" -x pw -V ${HOME} groupshow wheel } +atf_test_case user_do_not_try_to_delete_root_if_user_unkown +user_do_not_try_to_delete_root_if_user_unkown_head() { + atf_set "descr" "Make sure not to try to remove root if deleteing an unknown user" +} + +user_do_not_try_to_delete_root_if_user_unkown_body() { + populate_etc_skel + atf_check -e inline:"pw: -u expects a number\n" -s exit:64 -x pw -V ${HOME} userdel -u plop +} + atf_init_test_cases() { atf_add_test_case rmuser_seperate_group atf_add_test_case group_do_not_delete_wheel_if_group_unkown + atf_add_test_case user_do_not_try_to_delete_root_if_user_unkown } -- cgit v1.2.3-56-ge451 From 04c1a8669ab01c8bb76f4cbf48aa2f8c56fa80e9 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Mon, 17 Nov 2014 15:44:00 +0000 Subject: Clean up some language Reviewed by: will --- pw/tests/pw_delete.sh | 22 +++++++++++----------- pw/tests/pw_etcdir.sh | 14 +++++++------- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'pw/tests/pw_delete.sh') diff --git a/pw/tests/pw_delete.sh b/pw/tests/pw_delete.sh index 0e97939..02a9ade 100755 --- a/pw/tests/pw_delete.sh +++ b/pw/tests/pw_delete.sh @@ -15,33 +15,33 @@ rmuser_seperate_group_body() { pw -V ${HOME} useradd test || atf_fail "Creating test user" pw -V ${HOME} groupmod test -M 'test,root' || \ atf_fail "Modifying the group" - pw -V ${HOME} userdel test || atf_fail "delete the user" + pw -V ${HOME} userdel test || atf_fail "Delete the test user" } -atf_test_case group_do_not_delete_wheel_if_group_unkown -group_do_not_delete_wheel_if_group_unkown_head() { - atf_set "descr" "Make sure we do not consider as gid 0 an unknown group" +atf_test_case group_do_not_delete_wheel_if_group_unknown +group_do_not_delete_wheel_if_group_unknown_head() { + atf_set "descr" "Make sure we do not consider gid 0 an unknown group" } -group_do_not_delete_wheel_if_group_unkown_body() { +group_do_not_delete_wheel_if_group_unknown_body() { populate_etc_skel atf_check -s exit:0 -o inline:"wheel:*:0:root\n" -x pw -V ${HOME} groupshow wheel atf_check -e inline:"pw: -g expects a number\n" -s exit:64 -x pw -V ${HOME} groupdel -g I_do_not_exist atf_check -s exit:0 -o inline:"wheel:*:0:root\n" -x pw -V ${HOME} groupshow wheel } -atf_test_case user_do_not_try_to_delete_root_if_user_unkown -user_do_not_try_to_delete_root_if_user_unkown_head() { - atf_set "descr" "Make sure not to try to remove root if deleteing an unknown user" +atf_test_case user_do_not_try_to_delete_root_if_user_unknown +user_do_not_try_to_delete_root_if_user_unknown_head() { + atf_set "descr" "Make sure not to try to remove root if deleting an unknown user" } -user_do_not_try_to_delete_root_if_user_unkown_body() { +user_do_not_try_to_delete_root_if_user_unknown_body() { populate_etc_skel atf_check -e inline:"pw: -u expects a number\n" -s exit:64 -x pw -V ${HOME} userdel -u plop } atf_init_test_cases() { atf_add_test_case rmuser_seperate_group - atf_add_test_case group_do_not_delete_wheel_if_group_unkown - atf_add_test_case user_do_not_try_to_delete_root_if_user_unkown + atf_add_test_case group_do_not_delete_wheel_if_group_unknown + atf_add_test_case user_do_not_try_to_delete_root_if_user_unknown } diff --git a/pw/tests/pw_etcdir.sh b/pw/tests/pw_etcdir.sh index edb97fe..b237789 100755 --- a/pw/tests/pw_etcdir.sh +++ b/pw/tests/pw_etcdir.sh @@ -1,18 +1,18 @@ # $FreeBSD$ -# When provide -V dir, dir must exists -atf_test_case etcdir_must_exists -etcdir_must_exists_head() { - atf_set "descr" "When provide -V dir, dir must exists" +# When the '-V directory' option is provided, the directory must exist +atf_test_case etcdir_must_exist +etcdir_must_exist_head() { + atf_set "descr" "When the '-V directory' option is provided, the directory must exist" } -etcdir_must_exists_body() { - local fakedir="/this_directory_does_not_exists" +etcdir_must_exist_body() { + local fakedir="/this_directory_does_not_exist" atf_check -e inline:"pw: no such directory \`$fakedir'\n" \ -s exit:72 -x pw -V ${fakedir} usershow root } atf_init_test_cases() { - atf_add_test_case etcdir_must_exists + atf_add_test_case etcdir_must_exist } -- cgit v1.2.3-56-ge451