Browse Source

Support for DS records

master^2
Sebastian Lohff 4 years ago
parent
commit
ef5afbfe3a
  1. 3
      bin/dns-sync
  2. 35
      domains/forms.py
  3. 25
      domains/migrations/0004_auto_20170403_0533.py
  4. 20
      domains/migrations/0005_domain_ds_records.py
  5. 3
      domains/models.py
  6. 2
      whoisdb/helpers.py

3
bin/dns-sync

@ -105,6 +105,9 @@ def getDomainsFromQueryset(qs, zone, glueRecords, usedNameservers, v4reverse=Fal @@ -105,6 +105,9 @@ def getDomainsFromQueryset(qs, zone, glueRecords, usedNameservers, v4reverse=Fal
zone.append((domain.getZone(), "NS", servers))
if domain.ds_records:
zone.append((domain.getZone(), "DS", domain.ds_records.split("\n")))
if v4reverse:
# for ipv4 reverse we have to do some extra work in case of classless delegations
# see RFC2317

35
domains/forms.py

@ -15,10 +15,41 @@ import re @@ -15,10 +15,41 @@ import re
import ipaddress
class DomainForm(MntFormMixin, WhoisObjectFormMixin, forms.ModelForm):
class DSRecordMixin(object):
ds_re = re.compile(r"^(?P<id>\d+)\s+(?P<crypto>\d+)\s+(?P<hashtype>\d+)\s+(?P<hash>[0-9a-fA-F]+)$")
HASH_SUPPORTED = (1, 2)
CRYPTO_SUPPORTED = (3, 5, 6, 8, 10, 13, 15)
def clean_ds_records(self):
ds_records = self.cleaned_data['ds_records'].strip()
result = []
if not ds_records:
return ''
for n, rec in enumerate(ds_records.split("\n"), 1):
rec = rec.strip()
m = self.ds_re.match(rec)
if not m:
raise forms.ValidationError("Could not parse records {} - needs to be in format "
"'<id> <crypto> <hashtype> <hash>'".format(n))
if int(m.group('hashtype')) not in self.HASH_SUPPORTED:
raise forms.ValidationError("Record {} has an invalid hashtype of {}, supported are {}"
"".format(n, m.group('hashtype'), " ".join(map(str, self.HASH_SUPPORTED))))
if int(m.group('crypto')) not in self.CRYPTO_SUPPORTED:
raise forms.ValidationError("Record {} has unsupported crypto {}, supported are {}"
"".format(n, m.group('crypto'), " ".join(map(str, self.CRYPTO_SUPPORTED))))
result.append("{id} {crypto} {hashtype} {hash}".format(**m.groupdict()))
return "\n".join(result)
class DomainForm(MntFormMixin, WhoisObjectFormMixin, DSRecordMixin, forms.ModelForm):
class Meta:
model = Domain
fields = ['name', 'nameservers', 'mnt_by', 'admin_c']
fields = ['name', 'nameservers', 'mnt_by', 'admin_c', 'ds_records']
def __init__(self, *args, **kwargs):
super(DomainForm, self).__init__(*args, **kwargs)

25
domains/migrations/0004_auto_20170403_0533.py

@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-04-03 05:33
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('domains', '0003_auto_20170322_1801'),
]
operations = [
migrations.AlterField(
model_name='domain',
name='mnt_by',
field=models.ManyToManyField(help_text='You can select multiple maintainers here', to='whoisdb.Maintainer'),
),
migrations.AlterField(
model_name='nameserver',
name='mnt_by',
field=models.ManyToManyField(help_text='You can select multiple maintainers here', to='whoisdb.Maintainer'),
),
]

20
domains/migrations/0005_domain_ds_records.py

@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2019-05-30 21:18
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('domains', '0004_auto_20170403_0533'),
]
operations = [
migrations.AddField(
model_name='domain',
name='ds_records',
field=models.TextField(blank=True),
),
]

3
domains/models.py

@ -50,6 +50,9 @@ class Domain(MntdObject): @@ -50,6 +50,9 @@ class Domain(MntdObject):
nameservers = models.ManyToManyField(Nameserver, blank=True)
admin_c = models.ManyToManyField(Contact)
ds_records = models.TextField(blank=True, verbose_name='DS Records',
help_text='DS Records in the format of [id] [crypto-algo] [hash-algo] [hash]')
def getPK(self):
return self.name

2
whoisdb/helpers.py

@ -39,7 +39,7 @@ def getWhoisObjectFields(obj, owner): @@ -39,7 +39,7 @@ def getWhoisObjectFields(obj, owner):
fields.append(("Address CIDR", obj.prefix()))
_addFields(fields, obj, ["description", "parent_range", "origin_as", "mnt_by", "mnt_lower", "admin_c"])
elif c == domains.models.Domain:
_addFields(fields, obj, ["name", "nameservers", "mnt_by", "admin_c"])
_addFields(fields, obj, ["name", "nameservers", "mnt_by", "admin_c", "ds_records"])
elif c == domains.models.Nameserver:
_addFields(fields, obj, ["name", "glueIPv4", "glueIPv6", "mnt_by", "admin_c"])
elif c == domains.models.ReverseZone:

Loading…
Cancel
Save