flo/nsupdate.info
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Releases Activity

fixes #246, #249, #253. except DnsUpdateError and use random IP in check_domain().

Browse Source 
The delete() was removed because after an add() the nameserver need time to process the nsupdate query. This leads to an NXDOMAIN response on current ip check in delete() thus the delete() call fails.
This commit is contained in:
Fabian Weisshaar 2016-01-26 14:33:18 +01:00
parent 4c6b7b56a0
commit f987fae7e0
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/examples/bind9/named.conf
View File

@ -23,6 +23,8 @@ zone nsupdate.info {
deny nsupdate.info. name www.nsupdate.info; deny nsupdate.info. name www.nsupdate.info;
deny nsupdate.info. name ipv4.nsupdate.info; deny nsupdate.info. name ipv4.nsupdate.info;
deny nsupdate.info. name ipv6.nsupdate.info; deny nsupdate.info. name ipv6.nsupdate.info;
// this host is for testing if the nameserver is configured correctly and reachable
grant nsupdate.info. name connectivity-test.nsupdate.info A;
// but we allow updates to any other host: // but we allow updates to any other host:
grant nsupdate.info. subdomain nsupdate.info; grant nsupdate.info. subdomain nsupdate.info;
}; };

12
nsupdate/main/dnstools.py
View File

@ -24,6 +24,8 @@ import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
import socket import socket
import random
import struct
import dns.inet import dns.inet
import dns.name import dns.name
@ -104,18 +106,16 @@ def check_domain(domain):
from .models import Domain from .models import Domain
d = Domain.objects.get(name=domain) d = Domain.objects.get(name=domain)
# temporarily set domain to available # temporarily set domain to available to allow add/update/deletes
domain_available_state = d.available domain_available_state = d.available
d.available = True d.available = True
d.save() d.save()
try: try:
# add to primary # add host connectivity-test.<domain> with a random IP. See add()
add(fqdn, "8.8.8.8") add(fqdn, socket.inet_ntoa(struct.pack('>I', random.randint(1, 0xffffffff))))
# delete on primary
delete(fqdn)
except (dns.exception.DNSException, ) as e: except (dns.exception.DNSException, DnsUpdateError) as e:
raise NameServerNotAvailable(str(e)) raise NameServerNotAvailable(str(e))
finally: finally:

2
nsupdate/main/templates/main/generate_ns_secret.html
View File

@ -42,6 +42,8 @@ zone {{ object.name }} {
deny {{ object.name }}. name www.{{ object.name }}; deny {{ object.name }}. name www.{{ object.name }};
deny {{ object.name }}. name ipv4.{{ object.name }}; deny {{ object.name }}. name ipv4.{{ object.name }};
deny {{ object.name }}. name ipv6.{{ object.name }}; deny {{ object.name }}. name ipv6.{{ object.name }};
// this host is for testing if the nameserver is configured correctly and reachable
grant {{ object.name }}. name connectivity-test.{{ object.name }} A;
// but we allow updates to any other host: // but we allow updates to any other host:
grant {{ object.name }}. subdomain {{ object.name }}; grant {{ object.name }}. subdomain {{ object.name }};
}; };