From: Jeremy Allison Date: Sat, 18 Apr 2020 00:36:10 +0000 (-0700) Subject: s3: torture: Run the SMB1-SYSTEM-SECURITY test. X-Git-Tag: ldb-2.2.0~905 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f7821c98da962db053f075df6619ba0e6a54e90;p=thirdparty%2Fsamba.git s3: torture: Run the SMB1-SYSTEM-SECURITY test. Calls the test in the previous commit by adding SeSecurityPrivilege first, running the SMB1-SYSTEM-SECURITY test then removing SeSecurityPrivilege. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- diff --git a/source3/script/tests/test_smb1_system_security.sh b/source3/script/tests/test_smb1_system_security.sh new file mode 100755 index 00000000000..4c678b364f4 --- /dev/null +++ b/source3/script/tests/test_smb1_system_security.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# +# Runs the smbtorture3 SMB1-SYSTEM-SECURITY test +# that requres SeSecurityPrivilege against Samba. +# + +if [ $# -lt 7 ]; then + echo "Usage: $0 SERVER SERVER_IP USERNAME PASSWORD SMBTORTURE3 NET SHARE" + exit 1 +fi + +SERVER="$1" +SERVER_IP="$2" +USERNAME="$3" +PASSWORD="$4" +SMBTORTURE3="$5" +NET="$6" +SHARE="$7" + +failed=0 + +incdir=`dirname $0`/../../../testprogs/blackbox +. $incdir/subunit.sh + +smb1_system_security() { + out=$($SMBTORTURE3 //$SERVER_IP/$SHARE -U $USERNAME%$PASSWORD -mNT1 SMB1-SYSTEM-SECURITY) + if [ $? -ne 0 ] ; then + echo "SMB1-SYSTEM-SECURITY failed" + echo "$out" + return 1 + fi +} + +# Grant SeSecurityPrivilege to the user +testit "grant SeSecurityPrivilege" $NET rpc rights grant $USERNAME SeSecurityPrivilege -U $USERNAME%$PASSWORD -I $SERVER_IP || failed=`expr $failed + 1` + +# Run the test. +testit "smb1-system-secuirity" smb1_system_security || failed=`expr $failed + 1` + +# Revoke SeSecurityPrivilege +testit "revoke SeSecurityPrivilege" $NET rpc rights revoke $USERNAME SeSecurityPrivilege -U $USERNAME%$PASSWORD -I $SERVER_IP || failed=`expr $failed + 1` + +exit $failed diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 568434a208c..e693f50dc30 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -412,6 +412,9 @@ for env in ["fileserver"]: plantestsuite("samba3.blackbox.timestamps", env, [os.path.join(samba3srcdir, "script/tests/test_timestamps.sh"), '$SERVER_IP', '$USERNAME', '$PASSWORD', '$LOCAL_PATH', smbclient3]) + plantestsuite("samba3.blackbox.smb1_system_security", env + "_smb1_done", + [os.path.join(samba3srcdir, "script/tests/test_smb1_system_security.sh"), + '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', smbtorture3, net, 'tmp']) # # tar command tests