Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for DNAME, DS, and TLSA #83

Merged
merged 2 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## v0.0.8 - 2024-??-?? -

* DNAME, DS, and TLSA record type support added.

## v0.0.7 - 2023-11-14 - Maintenance release

* Improved NS1 API error logging
Expand Down
57 changes: 57 additions & 0 deletions octodns_ns1/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,12 +310,15 @@ class Ns1Provider(BaseProvider):
'ALIAS',
'CAA',
'CNAME',
'DNAME',
'DS',
'MX',
'NAPTR',
'NS',
'PTR',
'SPF',
'SRV',
'TLSA',
'TXT',
'URLFWD',
)
Expand Down Expand Up @@ -857,6 +860,7 @@ def _data_for_CNAME(self, _type, record):
return {'ttl': record['ttl'], 'type': _type, 'value': value}

_data_for_ALIAS = _data_for_CNAME
_data_for_DNAME = _data_for_CNAME

def _data_for_MX(self, _type, record):
values = []
Expand Down Expand Up @@ -921,6 +925,39 @@ def _data_for_URLFWD(self, _type, record):
)
return {'ttl': record['ttl'], 'type': _type, 'values': values}

def _data_for_DS(self, _type, record):
values = []
for answer in record['short_answers']:
key_tag, algorithm, digest_type, digest = answer.split(' ', 3)
values.append(
{
'key_tag': key_tag,
'algorithm': algorithm,
'digest_type': digest_type,
'digest': digest,
}
)
return {'ttl': record['ttl'], 'type': _type, 'values': values}

def _data_for_TLSA(self, _type, record):
values = []
for answer in record['short_answers']:
(
certificate_usage,
selector,
matching_type,
certificate_association_data,
) = answer.split(' ', 3)
values.append(
{
'certificate_usage': certificate_usage,
'selector': selector,
'matching_type': matching_type,
'certificate_association_data': certificate_association_data,
}
)
return {'ttl': record['ttl'], 'type': _type, 'values': values}

def list_zones(self):
return sorted([f'{z["zone"]}.' for z in self._client.zones_list()])

Expand Down Expand Up @@ -1636,6 +1673,7 @@ def _params_for_CNAME(self, record):
}, None

_params_for_ALIAS = _params_for_CNAME
_params_for_DNAME = _params_for_CNAME

def _params_for_MX(self, record):
values = [(v.preference, v.exchange) for v in record.values]
Expand Down Expand Up @@ -1664,6 +1702,25 @@ def _params_for_URLFWD(self, record):
]
return {'answers': values, 'ttl': record.ttl}, None

def _params_for_DS(self, record):
values = [
(v.key_tag, v.algorithm, v.digest_type, v.digest)
for v in record.values
]
return {'answers': values, 'ttl': record.ttl}, None

def _params_for_TLSA(self, record):
values = [
(
v.certificate_usage,
v.selector,
v.matching_type,
v.certificate_association_data,
)
for v in record.values
]
return {'answers': values, 'ttl': record.ttl}, None

def _extra_changes(self, desired, changes, **kwargs):
self.log.debug('_extra_changes: desired=%s', desired.name)
changed = set([c.record for c in changes])
Expand Down
65 changes: 65 additions & 0 deletions tests/test_provider_ns1.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,49 @@ class TestNs1Provider(TestCase):
},
)
)
expected.add(
Record.new(
zone,
'dname',
{'ttl': 43, 'type': 'DNAME', 'value': 'foo.unit.tests.'},
)
)
expected.add(
Record.new(
zone,
'ds',
{
'ttl': 44,
'type': 'DS',
'values': [
{
'key_tag': '60485',
'algorithm': 5,
'digest_type': 1,
'digest': '2BB183AF5F22588179A53B0A98631FAD1A292118',
}
],
},
)
)
expected.add(
Record.new(
zone,
'tlsa',
{
'ttl': 45,
'type': 'TLSA',
'values': [
{
'certificate_usage': 1,
'selector': 1,
'matching_type': 1,
'certificate_association_data': '8755CDAA8FE24EF16CC0F2C918063185E433FAAF1415664911D9E30A924138C4',
}
],
},
)
)

ns1_records = [
{
Expand Down Expand Up @@ -262,6 +305,28 @@ class TestNs1Provider(TestCase):
'short_answers': ['one.one.one.one.', 'two.two.two.two.'],
'domain': '1.2.3.4.unit.tests.',
},
{
'type': 'DNAME',
'ttl': 43,
'short_answers': ['foo.unit.tests.'],
'domain': 'dname.unit.tests.',
},
{
'type': 'DS',
'ttl': 44,
'short_answers': [
'60485 5 1 2BB183AF5F22588179A53B0A98631FAD1A292118'
],
'domain': 'ds.unit.tests.',
},
{
'type': 'TLSA',
'ttl': 45,
'short_answers': [
'1 1 1 8755CDAA8FE24EF16CC0F2C918063185E433FAAF1415664911D9E30A924138C4'
],
'domain': 'tlsa.unit.tests.',
},
]

@patch('ns1.rest.records.Records.retrieve')
Expand Down
Loading