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

improve method for listing server zones. parse xml rather than depend on a regex

This commit is contained in:
Jeffrey Forman 2012-10-13 08:00:38 -04:00
parent 80de5b2744
commit 1e2260bbec
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
binder/bcommon/models.py
View File

@ -1,10 +1,10 @@
from BeautifulSoup import BeautifulStoneSoup as BS
from django.db import models from django.db import models
import dns.query import dns.query
import dns.zone import dns.zone
import urllib2
from BeautifulSoup import BeautifulStoneSoup as BS
import re import re
import urllib2
TSIG_ALGORITHMS = (('hmac-md5', 'MD5'),('hmac-sha1', 'SHA1'),('hmac-224', 'SHA224'),('hmac-sha256', 'SHA256'),('hmac-sha384', 'SHA384'),('hmac-sha512', 'SHA512')) TSIG_ALGORITHMS = (('hmac-md5', 'MD5'),('hmac-sha1', 'SHA1'),('hmac-224', 'SHA224'),('hmac-sha256', 'SHA256'),('hmac-sha384', 'SHA384'),('hmac-sha512', 'SHA512'))
@ -31,12 +31,11 @@ class BindServer(models.Model):
mysoup = BS(xmloutput) mysoup = BS(xmloutput)
zones = mysoup.findAll('zone') zones = mysoup.findAll('zone')
for current_zone in zones: # Interate over found zones for current_zone in zones: # Interate over found zones
zone_name = current_zone.find('name').contents[0] zone_name = current_zone.find("name").string.split("/IN")[0]
try: # Is this zone of 'IN' type? zone_serial = current_zone.find("serial").string
in_zone = re.search(r"(.*)\/IN", zone_name).group(1) zone_class = current_zone.find("rdataclass").string
return_array.append(in_zone) if zone_class == "IN":
except: return_array.append({"zone_name" : zone_name, "zone_serial" : zone_serial })
pass
return return_array return return_array