sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3: smbd: Add two tests showing the ability to delete a directory containing a dangling symlink over SMB2 depends on "delete veto files" setting.

Browse Source 
Add knownfail.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14879

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit 942123b959)
This commit is contained in:
Jeremy Allison 2021-10-21 16:37:27 -07:00 committed by Jule Anger
parent 9f76641627
commit 359517877d
4 changed files with 191 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selftest/knownfail.d/rmdir_dangle_symlink Normal file
View File

@ -0,0 +1 @@
^samba3.blackbox.test_dangle_rmdir.rmdir can delete directory containing dangling symlink\(fileserver\)

4
selftest/target/Samba3.pm
View File

@ -1799,6 +1799,10 @@ sub setup_fileserver
veto files = /veto_name*/
delete veto files = yes
[delete_veto_files_only]
path = $veto_sharedir
delete veto files = yes
[homes]
comment = Home directories
browseable = No

183
source3/script/tests/test_delete_veto_files_only_rmdir.sh Executable file
View File

@ -0,0 +1,183 @@
#!/bin/sh
#
# Check smbclient can (or cannot) delete a directory containing dangling symlinks.
# BUG: https://bugzilla.samba.org/show_bug.cgi?id=14879
#
if [ $# -lt 6 ]; then
cat <<EOF
Usage: $0 SERVER SERVER_IP USERNAME PASSWORD SHAREPATH SMBCLIENT
EOF
exit 1;
fi
SERVER=${1}
SERVER_IP=${2}
USERNAME=${3}
PASSWORD=${4}
SHAREPATH=${5}
SMBCLIENT=${6}
shift 6
SMBCLIENT="$VALGRIND ${SMBCLIENT}"
ADDARGS="$@"
incdir=$(dirname "$0")/../../../testprogs/blackbox
. $incdir/subunit.sh
failed=0
rmdir_path="$SHAREPATH/dir"
#
# Using the share "[delete_veto_files_only]" we CAN delete
# a directory containing only a dangling symlink.
#
test_dangle_symlink_delete_veto_rmdir()
{
local dangle_symlink_path="$rmdir_path/bad_link"
local tmpfile=$PREFIX/smbclient.in.$$
# Create rmdir directory.
mkdir -p "$rmdir_path"
# Create dangling symlink underneath.
ln -s "nowhere-foo" "$dangle_symlink_path"
cat > "$tmpfile" <<EOF
cd dir
ls
quit
EOF
local cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT //$SERVER/delete_veto_files_only -U$USERNAME%$PASSWORD $ADDARGS < $tmpfile 2>&1'
eval echo "$cmd"
out=$(eval "$cmd")
ret=$?
# Check for smbclient error.
if [ $ret != 0 ] ; then
echo "Failed accessing share delete_veto_files_only - $ret"
echo "$out"
return 1
fi
# We should NOT see the dangling symlink file.
echo "$out" | grep bad_link
ret=$?
if [ $ret -eq 0 ] ; then
echo "Saw dangling symlink bad_link in share delete_veto_files_only"
echo "$out"
return 1
fi
# Try and remove the directory, should succeed.
cat > "$tmpfile" <<EOF
rd dir
quit
EOF
local cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT //$SERVER/delete_veto_files_only -U$USERNAME%$PASSWORD $ADDARGS < $tmpfile 2>&1'
eval echo "$cmd"
out=$(eval "$cmd")
ret=$?
# Check for smbclient error.
if [ $ret != 0 ] ; then
echo "Failed accessing share delete_veto_files_only - $ret"
echo "$out"
return 1
fi
# We should get no NT_STATUS_ errors.
echo "$out" | grep NT_STATUS_
ret=$?
if [ $ret -eq 0 ] ; then
echo "Got error NT_STATUS_ in share delete_veto_files_only"
echo "$out"
return 1
fi
return 0
}
#
# Using the share "[veto_files_nodelete]" we CANNOT delete
# a directory containing only a dangling symlink.
#
test_dangle_symlink_veto_files_nodelete()
{
local dangle_symlink_path="$rmdir_path/bad_link"
local tmpfile=$PREFIX/smbclient.in.$$
# Create rmdir directory.
mkdir -p "$rmdir_path"
# Create dangling symlink underneath.
ln -s "nowhere-foo" "$dangle_symlink_path"
cat > "$tmpfile" <<EOF
cd dir
ls
quit
EOF
local cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT //$SERVER/veto_files_nodelete -U$USERNAME%$PASSWORD $ADDARGS < $tmpfile 2>&1'
eval echo "$cmd"
out=$(eval "$cmd")
ret=$?
# Check for smbclient error.
if [ $ret != 0 ] ; then
echo "Failed accessing share veto_files_nodelete - $ret"
echo "$out"
return 1
fi
# We should NOT see the dangling symlink file.
echo "$out" | grep bad_link
ret=$?
if [ $ret -eq 0 ] ; then
echo "Saw dangling symlink bad_link in share veto_files_nodelete"
echo "$out"
return 1
fi
# Try and remove the directory, should fail with DIRECTORY_NOT_EMPTY.
cat > "$tmpfile" <<EOF
rd dir
quit
EOF
local cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT //$SERVER/veto_files_nodelete -U$USERNAME%$PASSWORD $ADDARGS < $tmpfile 2>&1'
eval echo "$cmd"
out=$(eval "$cmd")
ret=$?
# Check for smbclient error.
if [ $ret != 0 ] ; then
echo "Failed accessing share veto_files_nodelete - $ret"
echo "$out"
return 1
fi
# We should get NT_STATUS_DIRECTORY_NOT_EMPTY errors.
echo "$out" | grep NT_STATUS_DIRECTORY_NOT_EMPTY
ret=$?
if [ $ret -ne 0 ] ; then
echo "Should get NT_STATUS_DIRECTORY_NOT_EMPTY in share veto_files_nodelete"
echo "$out"
return 1
fi
return 0
}
testit "rmdir can delete directory containing dangling symlink" \
test_dangle_symlink_delete_veto_rmdir || failed=$(expr "$failed" + 1)
rm -rf "$rmdir_path"
testit "rmdir cannot delete directory delete_veto_files_no containing dangling symlink" \
test_dangle_symlink_veto_files_nodelete || failed=$(expr "$failed" + 1)
rm -rf "$rmdir_path"
exit "$failed"

3
source3/selftest/tests.py
View File

@ -542,6 +542,9 @@ for env in ["fileserver"]:
plantestsuite("samba3.blackbox.test_veto_rmdir", env,
[os.path.join(samba3srcdir, "script/tests/test_veto_rmdir.sh"),
'$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/veto', smbclient3])
plantestsuite("samba3.blackbox.test_dangle_rmdir", env,
[os.path.join(samba3srcdir, "script/tests/test_delete_veto_files_only_rmdir.sh"),
'$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/veto', smbclient3])
#
# tar command tests