summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsaac Boukris <iboukris@gmail.com>2019-09-04 16:39:43 +0300
committerStefan Metzmacher <metze@samba.org>2019-10-16 12:15:55 +0000
commit5c411a2f9f534ce034aa346f634d3ac2747c1552 (patch)
treed0f95207893a783f46a78420aa2b4d78df411932
parenta403e4d63e0de5cdd9fd13643835e050dae6b736 (diff)
downloadsamba-5c411a2f9f534ce034aa346f634d3ac2747c1552.tar.gz
selftest: add tests for no optimistic spnego exchange
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14106 Signed-off-by: Isaac Boukris <iboukris@redhat.com> Reviewed-by: Andreas Schneider <asn@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--selftest/knownfail.d/spnego_no_optimistic1
-rwxr-xr-xsource4/selftest/tests.py4
2 files changed, 5 insertions, 0 deletions
diff --git a/selftest/knownfail.d/spnego_no_optimistic b/selftest/knownfail.d/spnego_no_optimistic
new file mode 100644
index 00000000000..54f51446be0
--- /dev/null
+++ b/selftest/knownfail.d/spnego_no_optimistic
@@ -0,0 +1 @@
+^samba4.smb.spnego.*.no_optimistic
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 34ebe10cd79..d73d426ee3c 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -542,6 +542,10 @@ plansmbtorture4testsuite('base.xcopy', "ad_dc_ntvfs", ['//$NETBIOSNAME/xcopy_sha
plansmbtorture4testsuite('base.xcopy', "ad_dc_ntvfs", ['//$NETBIOSNAME/xcopy_share', '-k', 'no', '--signing=required', '-U%'], modname="samba4.smb.signing --signing=required anon")
plansmbtorture4testsuite('base.xcopy', "s4member", ['//$NETBIOSNAME/xcopy_share', '-k', 'no', '--signing=no', '-U%'], modname="samba4.smb.signing --signing=no anon")
+# Test SPNEGO without issuing an optimistic token
+opt='--option=spnego:client_no_optimistic=yes'
+plansmbtorture4testsuite('base.xcopy', "ad_dc", ['//$NETBIOSNAME/xcopy_share', '-U$USERNAME%$PASSWORD', opt, '-k', 'no'], modname="samba4.smb.spnego.ntlmssp.no_optimistic")
+plansmbtorture4testsuite('base.xcopy', "ad_dc", ['//$NETBIOSNAME/xcopy_share', '-U$USERNAME%$PASSWORD', opt, '-k', 'yes'], modname="samba4.smb.spnego.krb5.no_optimistic")
wb_opts_default = ["--option=\"torture:strict mode=no\"", "--option=\"torture:timelimit=1\"", "--option=\"torture:winbindd_separator=/\"", "--option=\"torture:winbindd_netbios_name=$SERVER\"", "--option=\"torture:winbindd_netbios_domain=$DOMAIN\""]