openstack/designate
Code Issues Proposed changes

Ensure CNAME RRSets only have one record

Browse Source 
Throw a 400 error back at the user if they try to create a CNAME
RRSet with more than 1 record.

Change-Id: I252fcd046dc902ff28162d831c0c0fd6b0dea3d2
Closes-Bug: 1486743
This commit is contained in:
TimSimmons 2015-09-17 16:28:58 -05:00
parent f6f2c4cd48
commit 476980e9a1
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
designate/central/service.py
View File

@ -423,6 +423,17 @@ class Service(service.RPCService, service.Service):
child_domain['name'] child_domain['name']
raise exceptions.InvalidRecordSetLocation(msg) raise exceptions.InvalidRecordSetLocation(msg)
def _is_valid_recordset_records(self, recordset):
"""
Check to make sure that the records in the recordset
follow the rules, and won't blow up on the nameserver.
"""
if hasattr(recordset, 'records'):
if len(recordset.records) > 1 and recordset.type == 'CNAME':
raise exceptions.BadRequest(
'CNAME recordsets may not have more than 1 record'
)
def _is_blacklisted_domain_name(self, context, domain_name): def _is_blacklisted_domain_name(self, context, domain_name):
""" """
Ensures the provided domain_name is not blacklisted. Ensures the provided domain_name is not blacklisted.
@ -1204,6 +1215,7 @@ class Service(service.RPCService, service.Service):
recordset.type) recordset.type)
self._is_valid_recordset_placement_subdomain( self._is_valid_recordset_placement_subdomain(
context, domain, recordset.name) context, domain, recordset.name)
self._is_valid_recordset_records(recordset)
if recordset.obj_attr_is_set('records') and len(recordset.records) > 0: if recordset.obj_attr_is_set('records') and len(recordset.records) > 0:
if increment_serial: if increment_serial:
@ -1328,6 +1340,7 @@ class Service(service.RPCService, service.Service):
recordset.type, recordset.id) recordset.type, recordset.id)
self._is_valid_recordset_placement_subdomain( self._is_valid_recordset_placement_subdomain(
context, domain, recordset.name) context, domain, recordset.name)
self._is_valid_recordset_records(recordset)
# Ensure TTL is above the minimum # Ensure TTL is above the minimum
ttl = changes.get('ttl', None) ttl = changes.get('ttl', None)

13
designate/tests/unit/test_central/test_basic.py
View File

@ -626,6 +626,19 @@ class CentralDomainTestCase(CentralBasic):
'bar.example.org.' 'bar.example.org.'
) )
def test_is_valid_recordset_records(self):
recordset = RoObject(
records=[
'ww1.example.com.',
'ww2.example.com.'
],
type='CNAME'
)
with testtools.ExpectedException(exceptions.BadRequest):
self.service._is_valid_recordset_records(
recordset
)
def test__is_superdomain(self): def test__is_superdomain(self):
self.service.storage.find_domains = Mock() self.service.storage.find_domains = Mock()
self.service._is_superdomain(self.context, 'example.org.', '1') self.service._is_superdomain(self.context, 'example.org.', '1')