d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure pw userdel -u <invalid> do not try to remove root

Browse Source 
Check the uid passed is actually a number as early as possible

MFC after:	1 week
This commit is contained in:
Baptiste Daroussin 2014-10-28 15:46:22 +00:00
parent 3b640d6bfc
commit 0def1c7441
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.sbin/pw/pw_user.c
View File

@ -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");
}
/*

11
usr.sbin/pw/tests/pw_delete.sh
View File

@ -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
}