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

Merge pull request #12 from Dunedan/fix-errorhandling-for-incorrect-keys 

Fixes error handling for broken TSIG keys.
This commit is contained in:
Jeffrey Forman 2015-03-22 14:10:32 -04:00
parent 78f097e681 43fe909ec6
commit fb43a9aa5a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
binder/models.py
View File

@ -1,6 +1,7 @@
### Binder Models ### Binder Models
# Standard Imports # Standard Imports
import binascii
import socket import socket
import urllib2 import urllib2
@ -47,11 +48,9 @@ class Key(models.Model):
return None return None
try: try:
keyring = dns.tsigkeyring.from_text({ keyring = dns.tsigkeyring.from_text({self.name: self.data})
self.name : self.data
})
except binascii.Error, err: except binascii.Error, err:
raise exceptions.KeyringException("Incorrect key data. Verify key: %s. Reason: %s" % (key_name, err)) raise exceptions.KeyringException("Incorrect key data. Verify key: %s. Reason: %s" % (self.name, err))
return keyring return keyring