[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  e2ea059e671 s3:tests: Add test for a dropbox with dir mode 0733
      from  f1577c2bc13 lib: Fix a shutdown crash with "clustering = yes"

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e2ea059e671140b32ea2ab1a35691a8e35d4a5f4
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Feb 13 13:48:17 2020 +0100

    s3:tests: Add test for a dropbox with dir mode 0733
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Tue Feb 18 21:07:44 UTC 2020 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 selftest/target/Samba3.pm            |  9 ++++
 source3/script/tests/test_dropbox.sh | 88 ++++++++++++++++++++++++++++++++++++
 source3/selftest/tests.py            |  1 +
 3 files changed, 98 insertions(+)
 create mode 100755 source3/script/tests/test_dropbox.sh


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 99230a6429c..08d51bbd57c 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -991,6 +991,9 @@ sub setup_fileserver
 	my $usershare_sharedir="$share_dir/usershares";
 	push(@dirs,$usershare_sharedir);
 
+	my $dropbox_sharedir="$share_dir/dropbox";
+	push(@dirs,$dropbox_sharedir);
+
 	my $fileserver_options = "
 	kernel change notify = yes
 	rpc_server:mdssvc = embedded
@@ -1079,6 +1082,12 @@ sub setup_fileserver
 	force create mode = 0664
 	vfs objects = dirsort
 
+[dropbox]
+	path = $dropbox_sharedir
+	comment = smb username is [%U]
+	writeable = yes
+	vfs objects =
+
 [homes]
 	comment = Home directories
 	browseable = No
diff --git a/source3/script/tests/test_dropbox.sh b/source3/script/tests/test_dropbox.sh
new file mode 100755
index 00000000000..d9d5101da30
--- /dev/null
+++ b/source3/script/tests/test_dropbox.sh
@@ -0,0 +1,88 @@
+#!/bin/sh
+#
+# Blackbox test for valid users.
+#
+
+if [ $# -lt 7 ]; then
+cat <<EOF
+Usage: $0 SERVER DOMAIN USERNAME PASSWORD PREFIX TARGET_ENV SMBCLIENT
+EOF
+exit 1;
+fi
+
+SERVER=${1}
+DOMAIN=${2}
+USERNAME=${3}
+PASSWORD=${4}
+PREFIX=${5}
+TARGET_ENV=${6}
+SMBCLIENT=${7}
+shift 7
+SMBCLIENT="$VALGRIND ${SMBCLIENT}"
+ADDARGS="$@"
+
+incdir=`dirname $0`/../../../testprogs/blackbox
+. $incdir/subunit.sh
+
+failed=0
+
+# Test listing a share with valid users succeeds
+test_dropbox()
+{
+    local filename="wurst.$$"
+    local filename_path="$PREFIX/$filename"
+    local dropbox_path="$PREFIX/$TARGET_ENV/share/$1/dirmode733"
+
+    local tmpfile=$PREFIX/smbclient.in.$$
+
+    echo "wurstbar" > $filename_path
+
+    cat > $tmpfile <<EOF
+lcd $PREFIX
+put $filename dirmode733\\$filename
+quit
+EOF
+
+    # Create dropbox directory and set permissions
+    mkdir -p $dropbox_path
+    chmod 0333 $dropbox_path
+
+    local cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT //$SERVER/$1 -U$USERNAME%$PASSWORD $ADDARGS < $tmpfile 2>&1'
+    eval echo "$cmd"
+    out=`eval $cmd`
+    ret=$?
+
+    # Reset dropbox permissions
+    chmod 0755 $dropbox_path
+    rm -f $tmpfile
+
+    if [ $ret != 0 ] ; then
+        echo "Failed accessing share $ret"
+        echo "$out"
+
+        return 1
+    fi
+    rm -f $filename_path
+
+    dropped_file="$dropbox_path/$filename"
+    if [ ! -r "$dropped_file" ]; then
+        echo "Failed to drop file $filename"
+        echo "$out"
+        return 1
+    fi
+
+    content=`cat $dropped_file`
+    if [ "$content" != "wurstbar" ]; then
+        echo "Invalid file content: $content"
+        echo "$out"
+        return 1
+    fi
+
+    return 0
+}
+
+testit "dropbox dirmode 0733" \
+   test_dropbox dropbox || \
+   failed=`expr $failed + 1`
+
+exit $failed
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 5953ba9bdaf..6657911d3ae 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -358,6 +358,7 @@ for env in ["fileserver"]:
     plantestsuite("samba3.blackbox.smbcquotas", env, [os.path.join(samba3srcdir, "script/tests/test_smbcquota.sh"), '$SERVER', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH', smbcquotas])
     plantestsuite("samba3.blackbox.valid_users", env, [os.path.join(samba3srcdir, "script/tests/test_valid_users.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$PREFIX', smbclient3])
     plantestsuite("samba3.blackbox.force_create_mode", env, [os.path.join(samba3srcdir, "script/tests/test_force_create_mode.sh"), '$SERVER', '$DOMAIN', '$USERNAME', '$PASSWORD', '$PREFIX', env, smbclient3])
+    plantestsuite("samba3.blackbox.dropbox", env, [os.path.join(samba3srcdir, "script/tests/test_dropbox.sh"), '$SERVER', '$DOMAIN', 'gooduser', '$PASSWORD', '$PREFIX', env, smbclient3])
     plantestsuite("samba3.blackbox.offline", env, [os.path.join(samba3srcdir, "script/tests/test_offline.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/offline', smbclient3])
     plantestsuite("samba3.blackbox.shadow_copy2.NT1", env, [os.path.join(samba3srcdir, "script/tests/test_shadow_copy.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/shadow', smbclient3, '-m', 'NT1'])
     plantestsuite("samba3.blackbox.shadow_copy2.SMB3", env, [os.path.join(samba3srcdir, "script/tests/test_shadow_copy.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/shadow', smbclient3, '-m', 'SMB3'])


-- 
Samba Shared Repository