Dyomedea
/
binder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clean up some unused imports, also handle exceptions for adding cname

This commit is contained in:
Jeffrey Forman 2012-11-25 18:02:01 -05:00
parent 0c36d0f4a8
commit 0c35125777
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
binder/helpers.py
View File

@ -1,15 +1,10 @@
from binder import keyutils, exceptions from binder import exceptions, keyutils, models
# TODO: Start using exceptions here, force a record/add/delete on
# an unresponsive Bind server.
import re
import dns.query import dns.query
import dns.reversename import dns.reversename
import dns.update import dns.update
import dns.tsig
from binder import exceptions, models import re
re_IPADDRESS = re.compile(r"\d+.\d+.\d+.\d+")
def add_forward_record(dns_server, zone_name, record_name, record_type, record_data, ttl, keyring): def add_forward_record(dns_server, zone_name, record_name, record_type, record_data, ttl, keyring):
""" Create a forward DNS record given passed arguments. """ Create a forward DNS record given passed arguments.
@ -106,8 +101,7 @@ def add_record(dns_server, zone_name, record_name, record_type, record_data, ttl
def add_cname_record(dns_server, zone_name, originating_record, cname, ttl, key_name): def add_cname_record(dns_server, zone_name, originating_record, cname, ttl, key_name):
"""Add a Cname record.""" """Add a Cname record."""
if key_name == "None": if key_name is None:
# TODO: Does this need to be changed to "key_name is None"
keyring = None keyring = None
else: else:
this_key = models.Key.objects.get(name=key_name) this_key = models.Key.objects.get(name=key_name)
@ -115,7 +109,16 @@ def add_cname_record(dns_server, zone_name, originating_record, cname, ttl, key_
update = dns.update.Update(zone_name, keyring = keyring) update = dns.update.Update(zone_name, keyring = keyring)
update.replace(cname, ttl, 'CNAME', originating_record + ".") update.replace(cname, ttl, 'CNAME', originating_record + ".")
response = dns.query.tcp(update, dns_server)
try:
response = dns.query.tcp(update, dns_server)
except dns.tsig.PeerBadKey, err:
# There is a mismatch between TSIG key configuration
# for allow-update in the named.conf, and the key
# selected to be used for the update.
# Combos that are tripped:
# * allow-update is a netmask, but key selected on form.
raise exceptions.RecordException("TSIG key mismatch between your BIND configuration and what was selected on the form.")
return [{ "description" : "CNAME %s.%s points to %s" % (cname, zone_name, originating_record), return [{ "description" : "CNAME %s.%s points to %s" % (cname, zone_name, originating_record),
"output" : response}] "output" : response}]