Revert "selftest: add tests for net-ads over TLS"

As we are removing the option.

This reverts commit 10f61cd39b9e03e7bb781edf04022ea6ae1f1cac.

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

Signed-off-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/selftest/knownfail.d/net_ads_ntlm_fallback b/selftest/knownfail.d/net_ads_ntlm_fallback
deleted file mode 100644 (file)
index b16a39d..0000000
--- a/selftest/knownfail.d/net_ads_ntlm_fallback
+++ /dev/null
@@ -1,10 +0,0 @@
-# net-ads commands that fail with: --option=gensec:gse_krb5=no
-^samba4.blackbox.net_ads_base.nomech=gse_krb5.testjoin
-^samba4.blackbox.net_ads_base.nomech=gse_krb5.check dNSHostName
-^samba4.blackbox.net_ads_base.nomech=gse_krb5.check SPN
-^samba4.blackbox.net_ads_base.nomech=gse_krb5.test setspn list
-^samba4.blackbox.net_ads_tls.nomech=gse_krb5.testjoin
-^samba4.blackbox.net_ads_tls.nomech=gse_krb5.check dNSHostName
-^samba4.blackbox.net_ads_tls.nomech=gse_krb5.check ldapssl=off
-^samba4.blackbox.net_ads_tls.nomech=gse_krb5.check SPN
-^samba4.blackbox.net_ads_tls.nomech=gse_krb5.test setspn list

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index c6da90cc740970f791057f0f03ee705aafb0e28d..42be34a8afca2afa9ad99df444ae2ed878ffdced 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -552,12 +552,6 @@ plantestsuite("samba4.blackbox.net_ads_dns_async(ad_member:local)",
             '$REALM'])
 plantestsuite("samba4.blackbox.samba-tool_ntacl(ad_member:local)", "ad_member:local", [os.path.join(bbdir, "test_samba-tool_ntacl.sh"), '$PREFIX', '$DOMSID'])
 
-for nomech in ["none", "gse_krb5", "ntlmssp"]:
-    # we can't test TLS with ad_dc env as it doesn't allow SASL over TLS
-    plantestsuite("samba4.blackbox.net_ads_base.nomech=%s" % nomech, "ad_dc:client", [os.path.join(bbdir, "test_net_ads_base.sh"), '$DC_SERVER', '$DC_USERNAME', '$DC_PASSWORD', 'no', nomech, '$PREFIX_ABS'])
-    plantestsuite("samba4.blackbox.net_ads_tls.nomech=%s" % nomech, "fl2008dc:client", [os.path.join(bbdir, "test_net_ads_base.sh"), '$DC_SERVER', '$DC_USERNAME', '$DC_PASSWORD', 'yes', nomech, '$PREFIX_ABS'])
-    plantestsuite("samba4.blackbox.net_ads_tls.nomech=%s" % nomech, "fl2008r2dc:client", [os.path.join(bbdir, "test_net_ads_base.sh"), '$DC_SERVER', '$DC_USERNAME', '$DC_PASSWORD', 'noverify', nomech, '$PREFIX_ABS'])
-
 if have_gnutls_crypto_policies:
     plantestsuite("samba4.blackbox.weak_crypto.client", "ad_dc", [os.path.join(bbdir, "test_weak_crypto.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', "$PREFIX/ad_dc"])
 
@@ -568,8 +562,6 @@ if have_gnutls_crypto_policies:
     t = "--krb5auth=$DOMAIN/$DC_USERNAME%$DC_PASSWORD"
     plantestsuite("samba3.wbinfo_simple.fips.%s" % t, "ad_member_fips:local", [os.path.join(srcdir(), "nsswitch/tests/test_wbinfo_simple.sh"), t])
     plantestsuite("samba4.wbinfo_name_lookup.fips", "ad_member_fips", [os.path.join(srcdir(), "nsswitch/tests/test_wbinfo_name_lookup.sh"), '$DOMAIN', '$REALM', '$DC_USERNAME'])
-    for nomech in ["none", "ntlmssp"]:
-        plantestsuite("samba4.blackbox.net_ads_base.nomech=%s" % nomech, "ad_dc_fips:client", [os.path.join(bbdir, "test_net_ads_base.sh"), '$DC_SERVER', '$DC_USERNAME', '$DC_PASSWORD', 'no', nomech, '$PREFIX_ABS'])
 
 plantestsuite_loadlist("samba4.rpc.echo against NetBIOS alias", "ad_dc_ntvfs", [valgrindify(smbtorture4), "$LISTOPT", "$LOADLIST", 'ncacn_np:$NETBIOSALIAS', '-U$DOMAIN/$USERNAME%$PASSWORD', 'rpc.echo'])
 # json tests hook into ``chgdcpass'' to make them run in contributor CI on

diff --git a/testprogs/blackbox/test_net_ads_base.sh b/testprogs/blackbox/test_net_ads_base.sh
deleted file mode 100755 (executable)
index 59e3da6..0000000
--- a/testprogs/blackbox/test_net_ads_base.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-
-if [ $# -lt 5 ]; then
-cat <<EOF
-Usage: test_net_ads_base.sh DC_SERVER DC_USERNAME DC_PASSWORD TLS_MODE NO_MECH PREFIX_ABS
-EOF
-exit 1;
-fi
-
-DC_SERVER=$1
-DC_USERNAME=$2
-DC_PASSWORD=$3
-TLS_MODE=$4
-NO_MECH=$5
-BASEDIR=$6
-shift 6
-
-HOSTNAME=`dd if=/dev/urandom bs=1 count=32 2>/dev/null | sha1sum | cut -b 1-10`
-HOSTNAME=`echo hn$HOSTNAME | tr '[:lower:]' '[:upper:]'`
-LCHOSTNAME=`echo $HOSTNAME | tr '[:upper:]' '[:lower:]'`
-
-RUNDIR=`pwd`
-cd $BASEDIR
-WORKDIR=`mktemp -d -p .`
-WORKDIR=`basename $WORKDIR`
-cp -a client/* $WORKDIR/
-sed -ri "s@(dir|directory) = (.*)/client/@\1 = \2/$WORKDIR/@" $WORKDIR/client.conf
-sed -ri "s/netbios name = .*/netbios name = $HOSTNAME/" $WORKDIR/client.conf
-sed -ri "s/workgroup = .*/workgroup = $DOMAIN/" $WORKDIR/client.conf
-sed -ri "s/realm = .*/realm = $REALM/" $WORKDIR/client.conf
-rm -f $WORKDIR/private/secrets.tdb
-cd $RUNDIR
-
-failed=0
-
-export LDAPTLS_CACERT=$(grep "tls cafile" $BASEDIR/$WORKDIR/client.conf | cut -f2 -d= | awk '{$1=$1};1')
-
-xoptions=""
-if [ $TLS_MODE != "no" ]; then
-       xoptions="--option=ldapsslads=yes"
-fi
-
-if [ $NO_MECH != "none" ]; then
-       xoptions="$xoptions --option=gensec:$NO_MECH=no"
-fi
-
-if [ $TLS_MODE = "noverify" ]; then
-       export LDAPTLS_REQCERT=allow
-fi
-
-net_tool="$VALGRIND $BINDIR/net -s $BASEDIR/$WORKDIR/client.conf --option=security=ads -k $xoptions"
-
-# Load test functions
-. `dirname $0`/subunit.sh
-
-testit "join" $net_tool ads join -U$DC_USERNAME%$DC_PASSWORD --no-dns-updates || failed=`expr $failed + 1`
-
-testit "testjoin" $net_tool ads testjoin -P || failed=`expr $failed + 1`
-
-testit_grep "check dNSHostName" $LCHOSTNAME $net_tool ads search -P samaccountname=$HOSTNAME\$ dNSHostName || failed=`expr $failed + 1`
-
-tls_log="StartTLS issued: using a TLS connection"
-opt="-d3 --option=ldapssl=off"
-if [ $TLS_MODE != "no" ]; then
-       testit_grep "check ldapssl=off" "$tls_log" $net_tool $opt ads search -P samaccountname=$HOSTNAME\$ dn || failed=`expr $failed + 1`
-fi
-
-testit_grep "check SPN" "HOST/$HOSTNAME" $net_tool ads search -P samaccountname=$HOSTNAME\$ servicePrincipalName || failed=`expr $failed + 1`
-
-testit_grep "test setspn list" "HOST/$HOSTNAME" $net_tool ads setspn list $HOSTNAME -P || failed=`expr $failed + 1`
-
-testit "leave" $net_tool ads leave -U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1`
-
-rm -rf $BASEDIR/$WORKDIR
-
-exit $failed