Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

ZTS: Fix incorrect use of libtest in user_run by xattr_003_neg 

You can't use user_run to eval ksh functions defined in libtest unless
you include libtest in the user shell.

Fix xattr_003_neg by:
* include libtest in the user shell
* *then* run get_xattr
* assert this fails
* use variables for filenames so they don't change in the user's shell
* don't log the contents of /etc/passwd
* cleanup all byproducts

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #11185
This commit is contained in:
Ryan Moeller 2020-11-09 17:57:00 -05:00 committed by Tony Hutter
parent acb4e7b0e1
commit de722e55ca
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tests/zfs-tests/tests/functional/xattr/xattr_003_neg.ksh
View File

@ -43,34 +43,40 @@
# 4. Check that we're unable to write an xattr as a non-root user # 4. Check that we're unable to write an xattr as a non-root user
# #
function cleanup { function cleanup
{
log_must rm $TESTDIR/myfile.$$ rm -f $testfile $tempfile
} }
log_assert "read/write xattr on a file with no permissions fails" log_assert "read/write xattr on a file with no permissions fails"
log_onexit cleanup log_onexit cleanup
log_must touch $TESTDIR/myfile.$$ typeset testfile=$TESTDIR/testfile.$$
create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd typeset tempfile=/tmp/tempfile.$$
log_must chmod 000 $TESTDIR/myfile.$$ log_must touch $testfile
create_xattr $testfile passwd /etc/passwd
log_must chmod 000 $testfile
if is_illumos; then if is_illumos; then
log_mustnot su $ZFS_USER -c "runat $TESTDIR/myfile.$$ cat passwd" log_mustnot su $ZFS_USER -c "runat $testfile cat passwd"
log_mustnot su $ZFS_USER -c "runat $TESTDIR/myfile.$$ cp /etc/passwd ." log_mustnot su $ZFS_USER -c "runat $testfile cp /etc/passwd ."
else else
user_run $ZFS_USER eval \ log_mustnot user_run $ZFS_USER "
"get_xattr passwd $TESTDIR/myfile.$$ >/tmp/passwd.$$" . $STF_SUITE/include/libtest.shlib
log_mustnot diff /etc/passwd /tmp/passwd.$$ get_xattr passwd $testfile >$tempfile
log_must rm /tmp/passwd.$$ "
log_mustnot diff -q /etc/passwd $tempfile
log_must rm $tempfile
user_run $ZFS_USER eval \ log_mustnot user_run $ZFS_USER "
"set_xattr_stdin passwd $TESTDIR/myfile.$$ </etc/group" . $STF_SUITE/include/libtest.shlib
log_must chmod 644 $TESTDIR/myfile.$$ set_xattr_stdin passwd $testfile </etc/group
get_xattr passwd $TESTDIR/myfile.$$ >/tmp/passwd.$$ "
log_must diff /etc/passwd /tmp/passwd.$$ log_must chmod 644 $testfile
log_must rm /tmp/passwd.$$ get_xattr passwd $testfile >$tempfile
log_must diff -q /etc/passwd $tempfile
log_must rm $tempfile
fi fi
log_pass "read/write xattr on a file with no permissions fails" log_pass "read/write xattr on a file with no permissions fails"