When input is prefect, adding a record works and shows output from dns update.

binder/bcommon/helpers.py

@@ -2,7 +2,11 @@ import urllib2
 from BeautifulSoup import BeautifulStoneSoup as BS
 import re
 
+from bcommon.models import Key
+import dns.query
+
 def list_server_zones(dns_hostname):
+    """ Take a DNS server, and list the DNS zones it provides resolution for. """
     # I should take the dns_hostname here, get the object from the DB,
     # and use the status port attribute for the urllib2 query.
     myreq = urllib2.Request("http://%s:853" % dns_hostname)
@@ -24,3 +28,39 @@ def list_server_zones(dns_hostname):
             pass
     
     return return_array
+
+def list_zone_records(dns_hostname, zone_name):
+    """ Take a DNS zone, and list all the records it contains. """
+    # Need to move most of this logic into a helper method.
+    try:
+        zone = dns.zone.from_xfr(dns.query.xfr(dns_hostname, zone_name))
+    except dns.exception.FormError:
+        # There was an error querying the server for the specific zone.
+        # Example: a zone that does not exist on the server.
+        return { 'errors' : 'Encountered a FormError when querying %s on %s' % (zone_name, dns_hostname) }
+    except socket.gaierror, e:
+        # TODO: Need to better handle errors here.
+        return { 'errors' : "Problems querying DNS server %s: %s" % (dns_hostname, e)  }
+
+    names = zone.nodes.keys()
+    names.sort() # Sort the array alphabetically
+    record_array = []
+    for current_name in names:
+        current_record = zone[current_name].to_text(current_name)
+        for split_record in current_record.split("\n"): # Split the records on the newline
+            record_array.append({'rr_name'  : split_record.split(" ")[0],
+                                 'rr_ttl'  : split_record.split(" ")[1],
+                                 'rr_class' : split_record.split(" ")[2],
+                                 'rr_type'  : split_record.split(" ")[3],
+                                 'rr_data'  : split_record.split(" ")[4]})
+    return record_array
+
+def add_record(clean_data):
+    key_name = Key.objects.get(name=(clean_data['tsig_key'])).name
+    key_data = Key.objects.get(name=(clean_data['tsig_key'])).data
+    key_algorithm = Key.objects.get(name=(clean_data['tsig_key'])).algorithm
+    keyring = dns.tsigkeyring.from_text({ key_name : key_data })
+    dns_update = dns.update.Update(clean_data['rr_domain'], keyring = keyring, keyalgorithm=key_algorithm)
+    dns_update.replace(str(clean_data['rr_name']), 10, str(clean_data['rr_type']), str(clean_data['rr_data']))
+    response = dns.query.tcp(dns_update, clean_data['dns_hostname'])
+    return response

binder/bcommon/views.py

@@ -3,12 +3,12 @@
 from bcommon.models import BindServer, Key
 from django.template import Context
 from django.shortcuts import render_to_response, redirect
-from bcommon.helpers import list_server_zones
+from bcommon.helpers import list_server_zones, list_zone_records, add_record
 
 from bcommon.forms import FormAddRecord
 from django.template import RequestContext
 
-import dns.query
+
 import dns.update
 import dns.tsigkeyring
 
@@ -18,6 +18,7 @@ def home_index(request):
     return render_to_response('index.htm')
 
 def list_servers(request):
+    """ List the DNS servers configured in the Django DB. """
     server_list = BindServer.objects.all().order_by('hostname')
     return render_to_response('bcommon/list_servers.htm',
                               { 'server_list' : server_list },
@@ -25,6 +26,7 @@ def list_servers(request):
 
 
 def view_server_zones(request, dns_hostname):
+    """ Display the list of DNS zones a particular DNS host provides. """
     zone_array = list_server_zones(dns_hostname)
     if 'errors' in zone_array:
         return render_to_response('bcommon/list_server_zones.htm',
@@ -36,30 +38,14 @@ def view_server_zones(request, dns_hostname):
                                 'dns_hostname' : dns_hostname },
                               context_instance=RequestContext(request))
 
-def list_zone_records(request, dns_hostname, zone_name):
+def view_zone_records(request, dns_hostname, zone_name):
-    # Need to move most of this logic into a helper method.
+    """ Display the list of records a particular zone on a DNS host provides. """
-    try:
+    record_array = list_zone_records(dns_hostname, zone_name)
-        zone = dns.zone.from_xfr(dns.query.xfr(dns_hostname, zone_name))
+    if 'errors' in record_array:
-    except dns.exception.FormError:
+        return render_to_response('bcommon/list_server_zones.htm',
-        # There was an error querying the server for the specific zone.
+                                  { 'errors' : record_array['errors'],
-        # Example: a zone that does not exist on the server.
+                                  'error_context' : record_array['error_context']},
-        return redirect('/info/')
+                                  context_instance=RequestContext(request))
-    except socket.gaierror, e:
-        # TODO: Need to better handle errors here.
-        print "Problems querying DNS server %s: %s\n" % (options.dns_server, e)
-        return # Need to handle this situation when it can't query the NS.'
-
-    names = zone.nodes.keys()
-    names.sort() # Sort the array alphabetically
-    record_array = []
-    for current_name in names:
-        current_record = zone[current_name].to_text(current_name)
-        for split_record in current_record.split("\n"): # Split the records on the newline
-            record_array.append({'rr_name'  : split_record.split(" ")[0],
-                                 'rr_ttl'  : split_record.split(" ")[1],
-                                 'rr_class' : split_record.split(" ")[2],
-                                 'rr_type'  : split_record.split(" ")[3],
-                                 'rr_data'  : split_record.split(" ")[4]})
 
     return render_to_response('bcommon/list_zone.htm',
                               { 'record_array' : record_array,
@@ -68,14 +54,16 @@ def list_zone_records(request, dns_hostname, zone_name):
                                 'rr_domain' : zone_name},
                               context_instance=RequestContext(request))
 
-def add_record(request, dns_hostname, zone_name):
+def view_add_record(request, dns_hostname, zone_name):
+    """ View to provide form to add a DNS record. """
     form = FormAddRecord(initial={ 'dns_hostname' : dns_hostname,
                                    'rr_domain' : zone_name })
-    return render_to_response('bcommon/add_record.htm',
+    return render_to_response('bcommon/add_record_form.htm',
                               { 'form' : form },
                               context_instance=RequestContext(request))
 
 def add_record_result(request):
+    """ Process the input given to add a DNS record. """
     if request.method == "GET":
         # Return home. You shouldn't be accessing the result
         # via a GET.
@@ -85,11 +73,7 @@ def add_record_result(request):
     form = FormAddRecord(request.POST)
     if form.is_valid():
         cd = form.cleaned_data
-        key_name = Key.objects.get(name=(cd['tsig_key'])).name
+        response = add_record(cd)
-        key_data = Key.objects.get(name=(cd['tsig_key'])).data
+        return render_to_response('bcommon/add_record_result.htm',
-        key_algorithm = Key.objects.get(name=(cd['tsig_key'])).algorithm
+                                  { 'response' : response },
-        keyring = dns.tsigkeyring.from_text({ key_name : key_data })
+                                  context_instance=RequestContext(request))
-        dns_update = dns.update.Update(cd['rr_domain'], keyring = keyring, keyalgorithm=key_algorithm)
-        dns_update.replace(str(cd['rr_name']), 10, str(cd['rr_type']), str(cd['rr_data']))
-        response = dns.query.tcp(dns_update, cd['dns_hostname'])
-        print "dns update response: %s" % response

binder/settings.py

@@ -69,9 +69,9 @@ TEMPLATE_LOADERS = (
 )
 
 MIDDLEWARE_CLASSES = (
+    'django.middleware.csrf.CsrfViewMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
 )

binder/templates/bcommon/add_record.htm

@@ -1,10 +0,0 @@
-{% extends "base.htm" %}
-
-{% block body %}
-<form action="/foo" method="post">
-<table>
-{{ form.as_table }}
-</table>
-<input type="submit" value="Submit" />
-</form>
-{% endblock body %}

binder/templates/bcommon/add_record_form.htm

@@ -0,0 +1,11 @@
+{% extends "base.htm" %}
+
+{% block body %}
+<form action="/add_record/result/" method="post">{% csrf_token %}
+  <table>
+    {{ form.as_table }}
+  </table>
+  <input type="submit" value="Submit" />
+
+</form>
+{% endblock body %}

binder/templates/bcommon/add_record_result.htm

@@ -0,0 +1,12 @@
+{% extends "base.htm" %}
+
+
+{% block pageheader %}
+Result:
+{% endblock pageheader %}
+
+{% block body %}
+<pre>
+  {{ response }}
+</pre>
+{% endblock body %}

binder/urls.py

@@ -10,8 +10,9 @@ urlpatterns = patterns('',
     (r'^$', 'bcommon.views.home_index'),
     (r'^info/$', 'bcommon.views.list_servers'),
     (r'^info/(?P<dns_hostname>[a-zA-Z0-9.-]+)/$', 'bcommon.views.view_server_zones'),
-    (r'^info/(?P<dns_hostname>[a-zA-Z0-9.-]+)/(?P<zone_name>[a-zA-Z0-9.-]+)/$', 'bcommon.views.list_zone'),
+    (r'^info/(?P<dns_hostname>[a-zA-Z0-9.-]+)/(?P<zone_name>[a-zA-Z0-9.-]+)/$', 'bcommon.views.view_zone_records'),
-    (r'^add_record/(?P<dns_hostname>[a-zA-Z0-9.-]+)/(?P<zone_name>[a-zA-Z0-9.-]+)/$', 'bcommon.views.add_record'),
+    (r'^add_record/(?P<dns_hostname>[a-zA-Z0-9.-]+)/(?P<zone_name>[a-zA-Z0-9.-]+)/$', 'bcommon.views.view_add_record'),
+    (r'^add_record/result/$', 'bcommon.views.add_record_result'),
 )
 
 if settings.DEBUG: