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

pw: do not removed home directories if not owned

Browse Source 
When deleting a user, if its home directory does not belong to it, it should
not be removed. This is the promise that the manpage makes, the tool should
ensure that it respects that promise.

Add a regression test about it

PR:		244967
Submitted by:	Eric Hanneken <eric@erichanneken.com>
MFC after:	3 days
This commit is contained in:
Baptiste Daroussin 2020-03-23 08:23:22 +00:00
parent c5247ac505
commit a75f9261d6
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/pw/rm_r.c
View File

@ -71,5 +71,8 @@ rm_r(int rootfd, const char *path, uid_t uid)
closedir(d);
if (fstatat(rootfd, path, &st, AT_SYMLINK_NOFOLLOW) != 0)
return;
unlinkat(rootfd, path, S_ISDIR(st.st_mode) ? AT_REMOVEDIR : 0);
if (S_ISLNK(st.st_mode))
unlinkat(rootfd, path, 0);
else if (st.st_uid == uid)
unlinkat(rootfd, path, AT_REMOVEDIR);
}

20
usr.sbin/pw/tests/pw_userdel_test.sh
View File

@ -67,10 +67,30 @@ home_not_a_dir_body() {
atf_check ${RPW} userdel foo -r
}
atf_test_case home_shared
home_shared_body() {
populate_root_etc_skel
mkdir ${HOME}/shared
atf_check ${RPW} useradd -n testuser1 -d /shared
atf_check ${RPW} useradd -n testuser2 -d /shared
atf_check ${RPW} userdel -n testuser1 -r
test -d ${HOME}/shared || atf_fail "Shared home has been removed"
}
atf_test_case home_regular_dir
home_regular_dir_body() {
populate_root_etc_skel
atf_check ${RPW} useradd -n foo -d /foo
atf_check ${RPW} userdel -n foo -r
[ ! -d ${HOME}/foo ] || atf_fail "Home has not been removed"
}
atf_init_test_cases() {
atf_add_test_case rmuser_seperate_group
atf_add_test_case user_do_not_try_to_delete_root_if_user_unknown
atf_add_test_case delete_files
atf_add_test_case delete_numeric_name
atf_add_test_case home_not_a_dir
atf_add_test_case home_shared
atf_add_test_case home_regular_dir
}