Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

install: validate -o, -g, and -f values when run with -U #1552

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

install: validate -o, -g, and -f values when run with -U #1552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions usr.bin/xinstall/tests/install_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,30 @@ set_owner_group_mode_unpriv_body() {
atf_check_equal "$u:$g:10$cM" "$(stat -f"%u:%g:%p" testc)"
}

atf_test_case metalog_unpriv
metalog_unpriv_head() {
atf_set "require.user" "unprivileged"
}
metalog_unpriv_body() {
printf "test" >testf

atf_check install -U -M METALOG -o root -g wheel -f arch testf testc
atf_check grep -q "testc .*uname=root gname=wheel .*flags=arch" METALOG

rm -f METALOG testc
atf_check -s exit:1 -e match:"unknown user no-such-user" install -U -o no-such-user testf testc
atf_check [ ! -f testc ]
atf_check [ ! -f METALOG ]

atf_check -s exit:1 -e match:"unknown group no-such-group" install -U -g no-such-group testf testc
atf_check [ ! -f testc ]
atf_check [ ! -f METALOG ]

atf_check -s exit:64 -e match:"nosuchflag: invalid flag" install -U -f nosuchflag testf testc
atf_check [ ! -f testc ]
atf_check [ ! -f METALOG ]
}

atf_test_case set_optional_exec
set_optional_exec_head() {
atf_set "require.user" "unprivileged"
Expand Down Expand Up @@ -556,5 +580,6 @@ atf_init_test_cases() {
atf_add_test_case mkdir_simple
atf_add_test_case set_owner_group_mode
atf_add_test_case set_owner_group_mode_unpriv
atf_add_test_case metalog_unpriv
atf_add_test_case set_optional_exec
}
6 changes: 3 additions & 3 deletions usr.bin/xinstall/xinstall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ main(int argc, char *argv[])
}

/* get group and owner id's */
if (group != NULL && !dounpriv) {
if (group != NULL) {
if (gid_from_group(group, &gid) == -1) {
id_t id;
if (!parseid(group, &id))
Expand All @@ -334,7 +334,7 @@ main(int argc, char *argv[])
} else
gid = (gid_t)-1;

if (owner != NULL && !dounpriv) {
if (owner != NULL) {
if (uid_from_user(owner, &uid) == -1) {
id_t id;
if (!parseid(owner, &id))
Expand All @@ -344,7 +344,7 @@ main(int argc, char *argv[])
} else
uid = (uid_t)-1;

if (fflags != NULL && !dounpriv) {
if (fflags != NULL) {
if (strtofflags(&fflags, &fset, NULL))
errx(EX_USAGE, "%s: invalid flag", fflags);
iflags |= SETFLAGS;
Expand Down
Loading