samba-tool: Test DNS record creation on member join

Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/samba_tool/join_member.py b/python/samba/tests/samba_tool/join_member.py
new file mode 100644 (file)
index 0000000..c2ab02f
--- /dev/null
+++ b/python/samba/tests/samba_tool/join_member.py
@@ -0,0 +1,71 @@
+# Unix SMB/CIFS implementation.
+# Copyright (C) David Mulder <dmulder@samba.org> 2021
+#
+# 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 re
+from samba.tests.samba_tool.base import SambaToolCmdTest
+from samba.param import LoadParm
+from samba.netcmd.common import netcmd_dnsname
+
+class JoinMemberCmdTestCase(SambaToolCmdTest):
+    """Test for samba-tool domain join subcommand"""
+
+    def test_join_member(self):
+        """Run a domain member join, and check that dns is updated"""
+        smb_conf = os.environ["SERVERCONFFILE"]
+        zone = os.environ["REALM"].lower()
+        lp = LoadParm()
+        lp.load(smb_conf)
+        dnsname = netcmd_dnsname(lp)
+        # Fetch the existing dns A records
+        (result, out, err) = self.runsubcmd("dns", "query",
+                                    os.environ["DC_SERVER"],
+                                    zone, dnsname, 'A',
+                                    "-s", smb_conf,
+                                    "-U%s%%%s" % (os.environ["DC_USERNAME"],
+                                                  os.environ["DC_PASSWORD"]))
+        self.assertCmdSuccess(result, out, err, 'Failed to find the record')
+
+        existing_records = re.findall('A:\s+(\d+\.\d+\.\d+\.\d+)\s', out)
+
+        # Remove the existing records
+        for record in existing_records:
+            (result, out, err) = self.runsubcmd("dns", "delete",
+                                        os.environ["DC_SERVER"],
+                                        zone, dnsname, 'A', record,
+                                        "-s", smb_conf,
+                                        "-U%s%%%s" % (os.environ["DC_USERNAME"],
+                                                      os.environ["DC_PASSWORD"]))
+            self.assertCmdSuccess(result, out, err, 'Failed to remove record')
+
+        # Perform the s3 member join (net ads join)
+        (result, out, err) = self.runsubcmd("domain", "join",
+                                    os.environ["REALM"], "member",
+                                    "-s", smb_conf,
+                                    "-U%s%%%s" % (os.environ["DC_USERNAME"],
+                                                  os.environ["DC_PASSWORD"]))
+        self.assertCmdSuccess(result, out, err, 'Failed to join member')
+
+        # Ensure the dns A record was created
+        (result, out, err) = self.runsubcmd("dns", "query",
+                                    os.environ["DC_SERVER"],
+                                    zone, dnsname, 'A',
+                                    "-s", smb_conf,
+                                    "-U%s%%%s" % (os.environ["DC_USERNAME"],
+                                                  os.environ["DC_PASSWORD"]))
+        self.assertCmdSuccess(result, out, err,
+                              'Failed to find dns host records for %s' % dnsname)

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 9709d90068056353b97230d7b00bf40a1cf241a9..306383ef9cf15bb724b4523ed714998f1761b5d6 100644 (file)
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -618,6 +618,7 @@ sub get_interface($)
                offlineadmem      => 58,
                s2kmember         => 59,
                admemidmapnss     => 60,
+               localadmember2    => 61,
 
                rootdnsforwarder  => 64,
 

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index d1ac5c16c264141d4f32b04f7e018c1ae13225ac..ebc410ed7e9b6ab9c5a363fa535e515eff16e5f4 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -241,6 +241,7 @@ sub check_env($$)
        ad_member_offlogon  => ["ad_dc"],
        ad_member_oneway    => ["fl2000dc"],
        ad_member_idmap_nss => ["ad_dc"],
+       ad_member_s3_join   => ["ad_dc"],
 
        clusteredmember => ["nt4_dc"],
 );
@@ -1003,6 +1004,28 @@ sub setup_ad_member
                                          $trustvars_e);
 }
 
+sub setup_ad_member_s3_join
+{
+        my ($self,
+            $prefix,
+            $dcvars,
+            $trustvars_f,
+            $trustvars_e) = @_;
+
+        # If we didn't build with ADS, pretend this env was never available
+        if (not $self->have_ads()) {
+                return "UNKNOWN";
+        }
+
+        print "PROVISIONING AD MEMBER...";
+
+        return $self->provision_ad_member($prefix,
+                                          "LOCALADMEMBER2",
+                                          $dcvars,
+                                          $trustvars_f,
+                                          $trustvars_e);
+}
+
 sub setup_ad_member_rfc2307
 {
        my ($self, $prefix, $dcvars) = @_;

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 85cd33c1206d39a1857474a0dcb47c2d23e84745..634e9b97562b51b6f42653b101d8bdfd505ae20c 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -857,6 +857,7 @@ planpythontestsuite("ad_dc_default:local", "samba.tests.dcerpc.unix")
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.srvsvc")
 planpythontestsuite("ad_dc_default:local", "samba.tests.samba_tool.timecmd")
 planpythontestsuite("ad_dc_default:local", "samba.tests.samba_tool.join")
+planpythontestsuite("ad_member_s3_join", "samba.tests.samba_tool.join_member")
 planpythontestsuite("ad_dc_default",
                     "samba.tests.samba_tool.join_lmdb_size")
 planpythontestsuite("ad_dc_default",