2024-12-22 13:34:15 +03:00 · 2022-06-02 18:39:57 +02:00 · 2022-06-02 18:39:57 +02:00 · b7810f03ff
commit b7810f03ff
parent 3bd753983c
3 changed files with 83 additions and 82 deletions
--- a/python/samba/tests/blackbox/netads_dns.py
+++ b/python/samba/tests/blackbox/netads_dns.py
@ -0,0 +1,81 @@
+# Blackbox tests for the "net ads dns async" commands
+#
+# Copyright (C) Samuel Cabrero <scabrero@samba.org> 2022
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import dns.resolver
+import re
+
+from samba.tests import BlackboxTestCase
+
+SERVER = os.environ["DC_SERVER"]
+REALM = os.environ["REALM"]
+COMMAND = "bin/net ads"
+
+class NetAdsDnsTests(BlackboxTestCase):
+
+    def setUp(self):
+        super(NetAdsDnsTests, self).setUp()
+        nameserver = os.environ["DC_SERVER_IP"]
+        self.resolver = dns.resolver.Resolver()
+        self.resolver.nameservers = [nameserver]
+
+    def parse_output(self, output):
+        v4 = []
+        v6 = []
+        for line in output.split("\n"):
+            m = re.search(r'^.*IPv4addr = (.*)$', line)
+            if m:
+                v4.append(m.group(1))
+            m = re.search(r'^.*IPv6addr = (.*)$', line)
+            if m:
+                v6.append(m.group(1))
+        return (v4, v6)
+
+    def test_async_dns(self):
+        host = "%s.%s" % (SERVER, REALM)
+
+        sync_v4 = []
+        answers = self.resolver.query(host, 'A')
+        for rdata in answers:
+            sync_v4.append(rdata.address)
+        self.assertGreaterEqual(len(sync_v4), 1)
+
+        sync_v6 = []
+        answers = self.resolver.query(host, 'AAAA')
+        for rdata in answers:
+            sync_v6.append(rdata.address)
+        self.assertGreaterEqual(len(sync_v6), 1)
+
+        async_v4 = []
+        async_v6 = []
+        argv = "%s dns async %s.%s " % (COMMAND, SERVER, REALM)
+        try:
+            out = self.check_output(argv)
+            (async_v4, async_v6) = self.parse_output(out.decode('utf-8'))
+        except samba.tests.BlackboxProcessError as e:
+            self.fail("Error calling [%s]: %s" % (argv, e))
+
+        self.assertGreaterEqual(len(async_v4), 1)
+        self.assertGreaterEqual(len(async_v6), 1)
+
+        sync_v4.sort()
+        async_v4.sort()
+        self.assertStringsEqual(' '.join(sync_v4), ' '.join(async_v4))
+
+        sync_v6.sort()
+        async_v6.sort()
+        self.assertStringsEqual(' '.join(sync_v6), ' '.join(async_v6))
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@ -654,12 +654,6 @@ plantestsuite("samba4.blackbox.client_etypes_all(ad_dc:client)", "ad_dc:client",
 plantestsuite("samba4.blackbox.client_etypes_legacy(ad_dc:client)", "ad_dc:client", [os.path.join(bbdir, "test_client_etypes.sh"), '$DC_SERVER', '$DC_USERNAME', '$DC_PASSWORD', '$PREFIX_ABS', 'legacy', '23'])
 plantestsuite("samba4.blackbox.client_etypes_strong(ad_dc:client)", "ad_dc:client", [os.path.join(bbdir, "test_client_etypes.sh"), '$DC_SERVER', '$DC_USERNAME', '$DC_PASSWORD', '$PREFIX_ABS', 'strong', '17_18'])
 plantestsuite("samba4.blackbox.net_ads_dns(ad_member:local)", "ad_member:local", [os.path.join(bbdir, "test_net_ads_dns.sh"), '$DC_SERVER', '$DC_USERNAME', '$DC_PASSWORD', '$REALM', '$USERNAME', '$PASSWORD'])
-plantestsuite("samba4.blackbox.net_ads_dns_async(ad_member:local)",
-        "ad_member:local",
-        [os.path.join(bbdir,
-            "test_net_ads_dns_async.sh"),
-            '$DC_SERVER',
-            '$REALM'])
 plantestsuite("samba4.blackbox.samba-tool_ntacl(ad_member:local)", "ad_member:local", [os.path.join(bbdir, "test_samba-tool_ntacl.sh"), '$PREFIX', '$DOMSID'])

 if have_gnutls_fips_mode_support:
@ -1219,6 +1213,8 @@ for env in ["ad_dc_ntvfs:local", "ad_dc:local",

 planoldpythontestsuite("none", "samba.tests.blackbox.downgradedatabase")

+planpythontestsuite("ad_member:local", "samba.tests.blackbox.netads_dns")
+
 plantestsuite_loadlist("samba4.ldap.python(ad_dc_default)", "ad_dc_default", [python, os.path.join(DSDB_PYTEST_DIR, "ldap.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])

 plantestsuite_loadlist("samba4.ldap_modify_order.python(ad_dc_default)",
--- a/testprogs/blackbox/test_net_ads_dns_async.sh
+++ b/testprogs/blackbox/test_net_ads_dns_async.sh
@ -1,76 +0,0 @@
-#!/bin/sh
-# Blackbox tests for net ads dns async
-# Copyright (C) 2020 Jeremy Allison <jra@samba.org>
-
-if [ $# -lt 2 ]; then
-cat <<EOF
-Usage: test_net_ads_dns_async.sh SERVER REALM
-EOF
-exit 1;
-fi
-
-SERVER=$1
-REALM=$2
-shift 2
-failed=0
-
-samba4bindir="$BINDIR"
-net_tool="$samba4bindir/net"
-
-. `dirname $0`/subunit.sh
-
-# Test looking up SERVER.REALM on server give the
-# same IP via async and non-async DNS.
-echo "Starting ..."
-
-test_async_dns() {
-	cmd_sync='dig @$SERVER +short -t a $SERVER.$REALM'
-	eval echo "$cmd_sync"
-	ipv4_sync=$(eval $cmd_sync)
-	if [ -z "$ipv4_sync" ]; then
-		return 1
-	fi
-	cmd_sync='dig @$SERVER +short -t aaaa $SERVER.$REALM'
-	eval echo "$cmd_sync"
-	ipv6_sync=$(eval $cmd_sync)
-	if [ -z "$ipv6_sync" ]; then
-		return 1
-	fi
-
-	#
-	# Do the async request. This prints out info like:
-	#
-	# Async A record lookup - got 1 names for addc.ADDOM.SAMBA.EXAMPLE.COM
-	# hostname[0] = addc.ADDOM.SAMBA.EXAMPLE.COM, IPv4addr = 10.53.57.30
-	# Async AAAA record lookup - got 1 names for addc.ADDOM.SAMBA.EXAMPLE.COM
-	# hostname[0] = addc.ADDOM.SAMBA.EXAMPLE.COM, IPv6addr = fd00::5357:5f1e
-	#
-	# So we must grep and sed to extract the matching IPv4 address
-	#
-	cmd_async='$net_tool ads dns async $SERVER.$REALM'
-	eval echo "$cmd_async"
-	out_async=$(eval $cmd_async)
-
-	# Drop everything but the IPv4 address.
-	ipv4_async=`echo "$out_async" | grep IPv4addr | sed -e 's/^.*IPv4addr = //'`
-	ipv6_async=`echo "$out_async" | grep IPv6addr | sed -e 's/^.*IPv6addr = //'`
-
-	if [ -z "$ipv4_async" -o -z "$ipv6_async" ]; then
-		return 1
-	fi
-	if [ "$ipv4_sync" != "$ipv4_async" ]; then
-		echo "DNS lookup mismatch. Sync $ipv4_sync, async $ipv4_async"
-		echo "DNS commands output. out1=$ipv4_sync, out2=$out_async"
-		return 1
-	fi
-	if [ "$ipv6_sync" != "$ipv6_async" ]; then
-		echo "DNS lookup mismatch. Sync $ipv6_sync, async $ipv6_async"
-		echo "DNS commands output. out1=$ipv6_sync, out2=$out_async"
-		return 1
-	fi
-	return 0
-}
-
-testit "Check async and non async DNS lookups match " test_async_dns || failed=`expr $failed + 1`
-
-exit $failed