diff options
| author |   Baptiste Daroussin <bapt@FreeBSD.org> | 2014-10-28 15:46:22 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-10-28 15:46:22 +0000 |
| commit | 3dbd5cfb7b9eec912c68ae204ea36bec869b48cd (patch) | |
| tree | e5bb438cc4d8a4e90946d1cd873331e6b9a93dbd /pw | |
| parent | 1f6950b26c668b108ded74fdea09aaf5f8abaeb8 (diff) | |
| download | pw-darwin-3dbd5cfb7b9eec912c68ae204ea36bec869b48cd.tar.gz pw-darwin-3dbd5cfb7b9eec912c68ae204ea36bec869b48cd.tar.zst pw-darwin-3dbd5cfb7b9eec912c68ae204ea36bec869b48cd.zip | |
Ensure pw userdel -u <invalid> do not try to remove root
Check the uid passed is actually a number as early as possible
MFC after: 1 week
Diffstat (limited to 'pw')
| -rw-r--r-- | pw/pw_user.c | 3 | ||||
| -rwxr-xr-x | pw/tests/pw_delete.sh | 11 |
2 files changed, 14 insertions, 0 deletions
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 } |