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

xinstall: fix dounpriv logic, add tests

Browse Source 
Sponsored by:	Klara, Inc.
MFC after:	1 week
This commit is contained in:
Dag-Erling Smørgrav 2022-08-03 20:59:28 +02:00
parent f863970a82
commit 36d67475f5
2 changed files with 87 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
usr.bin/xinstall/tests/install_test.sh
View File

@ -404,6 +404,84 @@ symbolic_link_relative_absolute_common_body() {
fi
}
atf_test_case set_owner_group_mode
set_owner_group_mode_head() {
atf_set "require.user" "root"
}
set_owner_group_mode_body() {
local fu=65531 fg=65531
local cu=65532 cg=65532
local u="$(id -u)"
local g="$(id -g)"
local m=0755 cm=4444
printf "test" >testf
atf_check chown "$fu:$fg" testf
atf_check chmod "$m" testf
atf_check install testf testc
atf_check_equal "$u:$g:10$m" "$(stat -f"%u:%g:%p" testc)"
atf_check install -o "$cu" testf testc
atf_check_equal "$cu:$g:10$m" "$(stat -f"%u:%g:%p" testc)"
atf_check install -g "$cg" testf testc
atf_check_equal "$u:$cg:10$m" "$(stat -f"%u:%g:%p" testc)"
atf_check install -o "$cu" -g "$cg" testf testc
atf_check_equal "$cu:$cg:10$m" "$(stat -f"%u:%g:%p" testc)"
atf_check install -m "$cm" testf testc
atf_check_equal "$u:$g:10$cm" "$(stat -f"%u:%g:%p" testc)"
atf_check install -o "$cu" -m "$cm" testf testc
atf_check_equal "$cu:$g:10$cm" "$(stat -f"%u:%g:%p" testc)"
atf_check install -g "$cg" -m "$cm" testf testc
atf_check_equal "$u:$cg:10$cm" "$(stat -f"%u:%g:%p" testc)"
atf_check install -o "$cu" -g "$cg" -m "$cm" testf testc
atf_check_equal "$cu:$cg:10$cm" "$(stat -f"%u:%g:%p" testc)"
}
atf_test_case set_owner_group_mode_unpriv
set_owner_group_mode_unpriv_head() {
atf_set "require.user" "root"
}
set_owner_group_mode_unpriv_body() {
local fu=65531 fg=65531
local cu=65532 cg=65532
local u="$(id -u)"
local g="$(id -g)"
local m=0755 cm=4444 cM=0444
printf "test" >testf
atf_check chown "$fu:$fg" testf
atf_check chmod "$m" testf
atf_check install -U testf testc
atf_check_equal "$u:$g:10$m" "$(stat -f"%u:%g:%p" testc)"
atf_check install -U -o "$cu" testf testc
atf_check_equal "$u:$g:10$m" "$(stat -f"%u:%g:%p" testc)"
atf_check install -U -g "$cg" testf testc
atf_check_equal "$u:$g:10$m" "$(stat -f"%u:%g:%p" testc)"
atf_check install -U -o "$cu" -g "$cg" testf testc
atf_check_equal "$u:$g:10$m" "$(stat -f"%u:%g:%p" testc)"
atf_check install -U -m "$cm" testf testc
atf_check_equal "$u:$g:10$cM" "$(stat -f"%u:%g:%p" testc)"
atf_check install -U -o "$cu" -m "$cm" testf testc
atf_check_equal "$u:$g:10$cM" "$(stat -f"%u:%g:%p" testc)"
atf_check install -U -g "$cg" -m "$cm" testf testc
atf_check_equal "$u:$g:10$cM" "$(stat -f"%u:%g:%p" testc)"
atf_check install -U -o "$cu" -g "$cg" -m "$cm" testf testc
atf_check_equal "$u:$g:10$cM" "$(stat -f"%u:%g:%p" testc)"
}
atf_init_test_cases() {
atf_add_test_case copy_to_nonexistent
atf_add_test_case copy_to_nonexistent_safe
@ -444,4 +522,6 @@ atf_init_test_cases() {
atf_add_test_case symbolic_link_relative_absolute_source_and_dest2
atf_add_test_case symbolic_link_relative_absolute_common
atf_add_test_case mkdir_simple
atf_add_test_case set_owner_group_mode
atf_add_test_case set_owner_group_mode_unpriv
}

15
usr.bin/xinstall/xinstall.c
View File

@ -1009,19 +1009,18 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags)
#endif
}
if (!dounpriv &
(gid != (gid_t)-1 && gid != to_sb.st_gid) ||
(uid != (uid_t)-1 && uid != to_sb.st_uid))
if (!dounpriv && ((gid != (gid_t)-1 && gid != to_sb.st_gid) ||
(uid != (uid_t)-1 && uid != to_sb.st_uid))) {
if (fchown(to_fd, uid, gid) == -1) {
serrno = errno;
(void)unlink(to_name);
errno = serrno;
err(EX_OSERR,"%s: chown/chgrp", to_name);
}
}
if (mode != (to_sb.st_mode & ALLPERMS)) {
if (fchmod(to_fd,
dounpriv ? mode & (S_IRWXU|S_IRWXG|S_IRWXO) : mode)) {
dounpriv ? mode & (S_IRWXU|S_IRWXG|S_IRWXO) : mode)) {
serrno = errno;
(void)unlink(to_name);
errno = serrno;
@ -1036,7 +1035,7 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags)
* trying to turn off UF_NODUMP. If we're trying to set real flags,
* then warn if the fs doesn't support it, otherwise fail.
*/
if (!dounpriv & !devnull && (flags & SETFLAGS ||
if (!dounpriv && !devnull && (flags & SETFLAGS ||
(from_sb.st_flags & ~UF_NODUMP) != to_sb.st_flags) &&
fchflags(to_fd,
flags & SETFLAGS ? fset : from_sb.st_flags & ~UF_NODUMP)) {
@ -1082,7 +1081,7 @@ compare(int from_fd, const char *from_name __unused, size_t from_len,
return 1;
do_digest = (digesttype != DIGEST_NONE && dresp != NULL &&
*dresp == NULL);
*dresp == NULL);
if (from_len <= MAX_CMP_SIZE) {
if (do_digest)
digest_init(&ctx);
@ -1390,7 +1389,7 @@ install_dir(char *path)
ch = *p;
*p = '\0';
again:
if (stat(path, &sb) < 0) {
if (stat(path, &sb) != 0) {
if (errno != ENOENT || tried_mkdir)
err(EX_OSERR, "stat %s", path);
if (mkdir(path, 0755) < 0) {