sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-31 20:22:15 +03:00
Code Activity

dns: test for treating fully qualified zones same as unqualified

Browse Source 
Failing test that checks if fully qualified zone names are treated the same
as unqualified zone names by the dns zone creation RPC method. Fix to follow.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13214
Signed-off-by: Aaron Haslett <aaronhaslett@catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Aaron Haslett
2018-08-20 16:07:15 +12:00
committed by Andrew Bartlett
parent 131ee1b2db
commit dd6175a273
2 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
python/samba/tests/dns.py
View File

@ -1080,7 +1080,7 @@ class TestZones(DNSTest):
if num != werror.WERR_DNS_ERROR_ZONE_DOES_NOT_EXIST:
raise
def create_zone(self, zone, aging_enabled=False):
def make_zone_obj(self, zone, aging_enabled=False):
zone_create = dnsserver.DNS_RPC_ZONE_CREATE_INFO_LONGHORN()
zone_create.pszZoneName = zone
zone_create.dwZoneType = dnsp.DNS_ZONE_TYPE_PRIMARY
@ -1089,6 +1089,10 @@ class TestZones(DNSTest):
zone_create.fDsIntegrated = 1
zone_create.fLoadExisting = 1
zone_create.fAllowUpdate = dnsp.DNS_ZONE_UPDATE_UNSECURE
return zone_create
def create_zone(self, zone, aging_enabled=False):
zone_create = self.make_zone_obj(zone, aging_enabled)
try:
client_version = dnsserver.DNS_CLIENT_VERSION_LONGHORN
self.rpc_conn.DnssrvOperation2(client_version,
@ -1100,7 +1104,7 @@ class TestZones(DNSTest):
dnsserver.DNSSRV_TYPEID_ZONE_CREATE,
zone_create)
except WERRORError as e:
self.fail(str(e))
self.fail(e)
def set_params(self, **kwargs):
zone = kwargs.pop('zone', None)
@ -1546,6 +1550,59 @@ class TestZones(DNSTest):
else:
self.assertEqual(len(recs), 1)
def test_fully_qualified_zone(self):
def create_zone_expect_exists(zone):
try:
zone_create = self.make_zone_obj(zone)
client_version = dnsserver.DNS_CLIENT_VERSION_LONGHORN
zc_type = dnsserver.DNSSRV_TYPEID_ZONE_CREATE
self.rpc_conn.DnssrvOperation2(client_version,
0,
self.server_ip,
None,
0,
'ZoneCreate',
zc_type,
zone_create)
except WERRORError as e:
enum, _ = e.args
if enum != werror.WERR_DNS_ERROR_ZONE_ALREADY_EXISTS:
self.fail(e)
return
self.fail("Zone {} should already exist".format(zone))
# Create unqualified, then check creating qualified fails.
self.create_zone(self.zone)
create_zone_expect_exists(self.zone + '.')
# Same again, but the other way around.
self.create_zone(self.zone + '2.')
create_zone_expect_exists(self.zone + '2')
client_version = dnsserver.DNS_CLIENT_VERSION_LONGHORN
request_filter = dnsserver.DNS_ZONE_REQUEST_PRIMARY
tid = dnsserver.DNSSRV_TYPEID_DWORD
typeid, res = self.rpc_conn.DnssrvComplexOperation2(client_version,
0,
self.server_ip,
None,
'EnumZones',
tid,
request_filter)
self.delete_zone(self.zone)
self.delete_zone(self.zone + '2')
# Two zones should've been created, neither of them fully qualified.
zones_we_just_made = []
zones = [str(z.pszZoneName) for z in res.ZoneArray]
for zone in zones:
if zone.startswith(self.zone):
zones_we_just_made.append(zone)
self.assertEqual(len(zones_we_just_made), 2)
self.assertEqual(set(zones_we_just_made), {self.zone + '2', self.zone})
def delete_zone(self, zone):
self.rpc_conn.DnssrvOperation2(dnsserver.DNS_CLIENT_VERSION_LONGHORN,
0,