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

Handle exception when attempting a zone list (xfr) fails.

This commit is contained in:
Jeffrey Forman 2012-11-25 18:00:48 -05:00
parent b80719c7ea
commit 5f2414266a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
binder/models.py
View File

@ -1,11 +1,13 @@
from django.db import models
from BeautifulSoup import BeautifulStoneSoup as BS from BeautifulSoup import BeautifulStoneSoup as BS
from binder import exceptions from binder import exceptions
from django.db import models
import dns.query import dns.query
import dns.tsig import dns.tsig
import dns.zone import dns.zone
import keyutils import keyutils
import socket
import urllib2 import urllib2
TSIG_ALGORITHMS = (('hmac-md5', 'MD5'), TSIG_ALGORITHMS = (('hmac-md5', 'MD5'),
@ -15,7 +17,7 @@ TSIG_ALGORITHMS = (('hmac-md5', 'MD5'),
('hmac-sha512', 'SHA512')) ('hmac-sha512', 'SHA512'))
class Key(models.Model): class Key(models.Model):
""" Class to store and reference TSIG keys. """ Store and reference TSIG keys.
TODO: Should/Can we encrypt these DNS keys in the DB? TODO: Should/Can we encrypt these DNS keys in the DB?
""" """
@ -28,7 +30,7 @@ class Key(models.Model):
class BindServer(models.Model): class BindServer(models.Model):
""" Class to store DNS servers and attributes for referencing their """ Store DNS servers and attributes for referencing their
statistics ports. Also reference FK for TSIG transfer keys, statistics ports. Also reference FK for TSIG transfer keys,
if required. if required.
""" """
@ -94,9 +96,14 @@ class BindServer(models.Model):
try: try:
zone = dns.zone.from_xfr(dns.query.xfr(self.hostname, zone_name, keyring=keyring)) zone = dns.zone.from_xfr(dns.query.xfr(self.hostname, zone_name, keyring=keyring))
except dns.exception.FormError, err: except dns.exception.FormError, err:
# TODO: What throws this?
raise exceptions.TransferException("There was an error attempting to list zone records.") raise exceptions.TransferException("There was an error attempting to list zone records.")
except dns.tsig.PeerBadKey: except dns.tsig.PeerBadKey:
# The incorrect TSIG key was selected for transfers.
raise exceptions.TransferException("Unable to list zone records because of a TSIG key mismatch.") raise exceptions.TransferException("Unable to list zone records because of a TSIG key mismatch.")
except socket.error, err:
# Thrown when the DNS server does not respond for a zone transfer (XFR).
raise exceptions.TransferException("DNS server did not respond for transfer. Reason: %s" % err)
names = zone.nodes.keys() names = zone.nodes.keys()
names.sort() names.sort()