From 1af0f6cd4388198130b1b638bdbd8311a26eef33 Mon Sep 17 00:00:00 2001 From: Daniel Roschka Date: Sun, 29 Mar 2015 21:05:23 +0200 Subject: [PATCH 1/6] Add Travis CI support To improve the code quality of binder, this commit adds support for continuous integration by using Travis CI (https://travis-ci.org/). This will ensure that every commit and every pull request will trigger test runs of the tests included in binder, helping to avoid code with broken tests. --- .travis.yml | 11 +++++++++++ README.markdown | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..b08ea74 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,11 @@ +language: python +python: + - "2.7" +env: + - DJANGO="Django>=1.6,<1.7" + - DJANGO="Django>=1.7,<1.8" +install: + - pip install -q $DJANGO + - pip install -r requirements.txt +script: + - python manage.py test \ No newline at end of file diff --git a/README.markdown b/README.markdown index 115f3ab..723fbe1 100644 --- a/README.markdown +++ b/README.markdown @@ -1,5 +1,7 @@ # Binder # +[![Build Status](https://travis-ci.org/jforman/binder.svg?branch=master)](https://travis-ci.org/jforman/binder) + A Django web application for viewing and editing BIND DNS zone records. Binder supports adding and deleting DNS records (and eventually editing in place). TSIG-authenticated transfers and updates are supported. From 8acbc5526bb49ccaca13d748e99250d13a467ee5 Mon Sep 17 00:00:00 2001 From: Daniel Roschka Date: Thu, 2 Apr 2015 07:20:02 +0200 Subject: [PATCH 2/6] Added support for Django 1.8. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b08ea74..18f353f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,9 @@ python: env: - DJANGO="Django>=1.6,<1.7" - DJANGO="Django>=1.7,<1.8" + - DJANGO="Django>=1.8,<1.9" install: - pip install -q $DJANGO - pip install -r requirements.txt script: - - python manage.py test \ No newline at end of file + - python manage.py test From d46ffd1abc0becaa9467eafd015216a7a4f76a83 Mon Sep 17 00:00:00 2001 From: Daniel Roschka Date: Thu, 2 Apr 2015 08:32:27 +0200 Subject: [PATCH 3/6] Clean up of various parts of the templates * Replaced tabs for indentation with proper spaces to have only spaces for indentation * Added the btn-default class to all buttons where it was missing * Added relations between labels and the elements they are labeling using the naming schema Django uses by default (might become handy in the future) * Added additional meta tags required by Bootstrap 3 * Moved the button for adding records in list_zone.html out of the table to get cleaner markup * Swapped out the used version of Bootstrap against the minified one. * Removed the commented out old code from delete_record_initial.html, because that's why we have version control --- binder/templates/base.html | 6 +- .../bcommon/add_cname_record_form.html | 38 +++++------ binder/templates/bcommon/add_record_form.html | 66 +++++++++---------- .../bcommon/delete_record_initial.html | 51 ++------------ binder/templates/bcommon/list_zone.html | 22 +++---- 5 files changed, 69 insertions(+), 114 deletions(-) diff --git a/binder/templates/base.html b/binder/templates/base.html index 5e58c32..d96b30a 100644 --- a/binder/templates/base.html +++ b/binder/templates/base.html @@ -3,7 +3,9 @@ {% block header %} Binder DNS Admin - + + + {% endblock header %} @@ -27,7 +29,7 @@
- {% block pageheader %}{% endblock pageheader %} + {% block pageheader %}{% endblock pageheader %}
diff --git a/binder/templates/bcommon/add_cname_record_form.html b/binder/templates/bcommon/add_cname_record_form.html index e67c9a0..255fac9 100644 --- a/binder/templates/bcommon/add_cname_record_form.html +++ b/binder/templates/bcommon/add_cname_record_form.html @@ -6,56 +6,56 @@
{% csrf_token %} Create CNAME record
- +
- +
- +
- +
- +
- +
- +
{% if form_errors.cname %} - + {% endif %}
- -
.{{zone_name}}
+ +
.{{zone_name}}
- +
{% for ttl, description in ttl_choices %} - + {% endfor %}
- +
- {% for key in tsig_keys %} {% empty %} @@ -65,7 +65,7 @@
- +
{% endblock body %} diff --git a/binder/templates/bcommon/add_record_form.html b/binder/templates/bcommon/add_record_form.html index d9146be..cabc7cc 100644 --- a/binder/templates/bcommon/add_record_form.html +++ b/binder/templates/bcommon/add_record_form.html @@ -6,22 +6,22 @@
{% csrf_token %} Create Record
- +
- +
- +
- +
- +
{% if form_errors.record_name %} {% endif %}
- -
.{{zone_name}}
+ +
.{{zone_name}}
@@ -40,34 +40,34 @@
{% if "in-addr.arpa" not in zone_name and "ip6.arpa" not in zone_name %} {% for type, name in record_type_choices %} -
- +
- {% if form_errors.record_data %} - + {% endif %} +
+ + {% if "in-addr.arpa" not in zone_name and "ip6.arpa" not in zone_name %} +
IP Address
+ {% else %} +
FQDN
+ {% endif %} +
@@ -75,28 +75,28 @@
{% for ttl, description in ttl_choices %} - + {% endfor %}
{% if "in-addr.arpa" not in zone_name and "ip.arpa" not in zone_name %}
- +
+ Yes +
{% endif %}
- +
- {% for key in tsig_keys %} {% empty %} @@ -106,7 +106,7 @@
- + Cancel {% endblock body %} diff --git a/binder/templates/bcommon/delete_record_initial.html b/binder/templates/bcommon/delete_record_initial.html index bcf7c71..76a0ca5 100644 --- a/binder/templates/bcommon/delete_record_initial.html +++ b/binder/templates/bcommon/delete_record_initial.html @@ -22,72 +22,29 @@ - TSIG Key +
- {% for key in tsig_keys %} {% empty %}
- + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/binder/templates/bcommon/list_zone.html b/binder/templates/bcommon/list_zone.html index 81e4785..503633f 100644 --- a/binder/templates/bcommon/list_zone.html +++ b/binder/templates/bcommon/list_zone.html @@ -4,10 +4,14 @@ {% block body %} {% if not errors %} -
{% csrf_token %} - -Add Record +Add Record +{% csrf_token %} + + + + +
@@ -18,17 +22,9 @@ - - {% for current_record in zone_array %} - + @@ -37,7 +33,7 @@
Select Name
-
- -
- 		{{ current_record.rr_name }} {{ current_record.rr_ttl }} {{ current_record.rr_class }}
- +
  • Edit Record (Coming Soon)
    • {% if current_record.rr_type == "A" %} From 581dc915fe54822148ed89698208e27c75a5ca54 Mon Sep 17 00:00:00 2001 From: Daniel Roschka Date: Sun, 29 Mar 2015 12:16:57 +0200 Subject: [PATCH 4/6] Change in the behavior of local_settings.py Up to now local_settings.py was used for binder specific configuration values. This commit moves these values to settings.py, removes local_settings.py from version control and adds logic to settings.py to allow settings in local_settings.py to overwrite ones defined in settings.py, enabling local_settings.py to be used as installation specific configuration file, e.g. for custom database configuration. --- .gitignore | 1 + binder/forms.py | 10 +++++----- binder/local_settings.py | 10 ---------- binder/settings.py | 14 ++++++++++++++ binder/views.py | 14 +++++++------- 5 files changed, 27 insertions(+), 22 deletions(-) delete mode 100644 binder/local_settings.py diff --git a/.gitignore b/.gitignore index 83e5248..77b76b0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ *.conf *~ /binder/secret.txt +/binder/local_settings.py diff --git a/binder/forms.py b/binder/forms.py index 420205b..ef9c040 100644 --- a/binder/forms.py +++ b/binder/forms.py @@ -2,11 +2,11 @@ # 3rd Party from django import forms +from django.conf import settings from django.forms import ValidationError # App Imports from models import Key -import local_settings ### Custom Form Fields @@ -40,10 +40,10 @@ class FormAddForwardRecord(forms.Form): """ Form used to add a Forward DNS record. """ dns_server = forms.CharField(max_length=100) record_name = forms.RegexField(max_length=100, regex="^[a-zA-Z0-9-_]+$", required=False) - record_type = forms.ChoiceField(choices=local_settings.RECORD_TYPE_CHOICES) + record_type = forms.ChoiceField(choices=settings.RECORD_TYPE_CHOICES) zone_name = forms.CharField(max_length=100) record_data = forms.GenericIPAddressField() - ttl = forms.ChoiceField(choices=local_settings.TTL_CHOICES) + ttl = forms.ChoiceField(choices=settings.TTL_CHOICES) create_reverse = forms.BooleanField(required=False) key_name = forms.ModelChoiceField(queryset=Key.objects.all(), required=False) @@ -54,7 +54,7 @@ class FormAddReverseRecord(forms.Form): record_type = forms.RegexField(regex=r"^PTR$",error_messages={"invalid" : "The only valid choice here is PTR."}) zone_name = forms.CharField(max_length=100) record_data = CustomStringPeriodSuffix(required=True) - ttl = forms.ChoiceField(choices=local_settings.TTL_CHOICES) + ttl = forms.ChoiceField(choices=settings.TTL_CHOICES) key_name = forms.ModelChoiceField(queryset=Key.objects.all(), required=False) create_reverse = forms.BooleanField(required=False) @@ -64,7 +64,7 @@ class FormAddCnameRecord(forms.Form): originating_record = forms.CharField(max_length=100) cname = forms.RegexField(max_length=100, regex="^[a-zA-Z0-9-_]+$") zone_name = forms.CharField(max_length=256) - ttl = forms.ChoiceField(choices=local_settings.TTL_CHOICES) + ttl = forms.ChoiceField(choices=settings.TTL_CHOICES) key_name = forms.ModelChoiceField(queryset=Key.objects.all(), required=False) class FormDeleteRecord(forms.Form): diff --git a/binder/local_settings.py b/binder/local_settings.py deleted file mode 100644 index a7a7f32..0000000 --- a/binder/local_settings.py +++ /dev/null @@ -1,10 +0,0 @@ -### Local settings to be shared across modules. - -TTL_CHOICES = ((300, "5 minutes"), - (1800, "30 minutes"), - (3600, "1 hour"), - (43200, "12 hours"), - (86400, "1 day")) - -RECORD_TYPE_CHOICES = (("A", "A"), - ("AAAA", "AAAA")) diff --git a/binder/settings.py b/binder/settings.py index a787a6a..b88d131 100644 --- a/binder/settings.py +++ b/binder/settings.py @@ -86,3 +86,17 @@ INSTALLED_APPS = ( ) TEST_RUNNER = 'django.test.runner.DiscoverRunner' + +TTL_CHOICES = ((300, "5 minutes"), + (1800, "30 minutes"), + (3600, "1 hour"), + (43200, "12 hours"), + (86400, "1 day")) + +RECORD_TYPE_CHOICES = (("A", "A"), + ("AAAA", "AAAA")) + +try: + from local_settings import * +except ImportError: + pass diff --git a/binder/views.py b/binder/views.py index 7047df1..595bdcc 100644 --- a/binder/views.py +++ b/binder/views.py @@ -1,11 +1,11 @@ ### Binder VIews # 3rd Party +from django.conf import settings from django.shortcuts import redirect, render # App Imports from binder import exceptions, forms, helpers, models -import local_settings def home_index(request): """ List the main index page for Binder. """ @@ -73,8 +73,8 @@ def view_add_record(request, dns_server, zone_name): { "dns_server" : this_server, "zone_name" : zone_name, "tsig_keys" : models.Key.objects.all(), - "ttl_choices" : local_settings.TTL_CHOICES, - "record_type_choices" : local_settings.RECORD_TYPE_CHOICES, + "ttl_choices": settings.TTL_CHOICES, + "record_type_choices": settings.RECORD_TYPE_CHOICES, }) @@ -119,8 +119,8 @@ def view_add_record_result(request): { "dns_server" : dns_server, "zone_name" : request.POST["zone_name"], "tsig_keys" : models.Key.objects.all(), - "ttl_choices" : local_settings.TTL_CHOICES, - "record_type_choices" : local_settings.RECORD_TYPE_CHOICES, + "ttl_choices": settings.TTL_CHOICES, + "record_type_choices": settings.RECORD_TYPE_CHOICES, "form_errors" : form.errors, "form_data" : request.POST }) @@ -134,7 +134,7 @@ def view_add_cname_record(request, dns_server, zone_name, record_name): { "dns_server" : this_server, "originating_record" : "%s.%s" % (record_name, zone_name), "zone_name" : zone_name, - "ttl_choices" : local_settings.TTL_CHOICES, + "ttl_choices": settings.TTL_CHOICES, "tsig_keys" : models.Key.objects.all() }) @@ -172,7 +172,7 @@ def view_add_cname_result(request): "originating_record" : request.POST["originating_record"], "form_data" : request.POST, "form_errors" : form.errors, - "ttl_choices" : local_settings.TTL_CHOICES, + "ttl_choices": settings.TTL_CHOICES, "tsig_keys" : models.Key.objects.all() }) From 8a67eeb8c5626da44ad5a5a136578e0e6ab5dd84 Mon Sep 17 00:00:00 2001 From: Daniel Roschka Date: Thu, 2 Apr 2015 13:39:18 +0200 Subject: [PATCH 5/6] Fixes label assignment to fields for radio button fields. --- binder/templates/bcommon/add_cname_record_form.html | 4 ++-- binder/templates/bcommon/add_record_form.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/binder/templates/bcommon/add_cname_record_form.html b/binder/templates/bcommon/add_cname_record_form.html index 255fac9..6aeabce 100644 --- a/binder/templates/bcommon/add_cname_record_form.html +++ b/binder/templates/bcommon/add_cname_record_form.html @@ -45,8 +45,8 @@
    {% for ttl, description in ttl_choices %} -
    diff --git a/binder/templates/bcommon/add_record_form.html b/binder/templates/bcommon/add_record_form.html index cabc7cc..78bf651 100644 --- a/binder/templates/bcommon/add_record_form.html +++ b/binder/templates/bcommon/add_record_form.html @@ -41,7 +41,7 @@ {% if "in-addr.arpa" not in zone_name and "ip6.arpa" not in zone_name %} {% for type, name in record_type_choices %} {% endfor %} {% else %} @@ -76,7 +76,7 @@
    {% for ttl, description in ttl_choices %} {% endfor %}
    From c885c823b5bfafa7141a6ca5817ed81a9b35558d Mon Sep 17 00:00:00 2001 From: Daniel Roschka Date: Thu, 2 Apr 2015 13:41:28 +0200 Subject: [PATCH 6/6] Removes a broken label assignment from the form to add CNAMEs. --- binder/templates/bcommon/add_cname_record_form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binder/templates/bcommon/add_cname_record_form.html b/binder/templates/bcommon/add_cname_record_form.html index 6aeabce..b77303e 100644 --- a/binder/templates/bcommon/add_cname_record_form.html +++ b/binder/templates/bcommon/add_cname_record_form.html @@ -42,7 +42,7 @@
- +
{% for ttl, description in ttl_choices %}