Re-add pretty_ipv6_ptr. Bug fixes

powerdnsadmin/routes/admin.py

@@ -3,7 +3,7 @@ import json
 import traceback
 from ast import literal_eval
 from distutils.version import StrictVersion
-from flask import Blueprint, render_template, make_response, url_for, current_app, request, redirect, jsonify, abort
+from flask import Blueprint, render_template, make_response, url_for, current_app, request, redirect, jsonify, abort, flash
 from flask_login import login_required, current_user
 
 from ..decorators import operator_role_required, admin_role_required
@@ -843,7 +843,7 @@ def create_template_from_zone():
                     for jr in jrecords:
                         if jr['type'] in Setting().get_records_allow_to_edit():
                             name = '@' if jr['name'] == domain_name else re.sub(
-                                '\.{}$'.format(domain_name), '', jr['name'])
+                                r'\.{}$'.format(domain_name), '', jr['name'])
                             for subrecord in jr['records']:
                                 record = DomainTemplateRecord(
                                     name=name,
@@ -858,7 +858,7 @@ def create_template_from_zone():
                     for jr in jrecords:
                         if jr['type'] in Setting().get_records_allow_to_edit():
                             name = '@' if jr['name'] == domain_name else re.sub(
-                                '\.{}$'.format(domain_name), '', jr['name'])
+                                r'\.{}$'.format(domain_name), '', jr['name'])
                             record = DomainTemplateRecord(
                                 name=name,
                                 type=jr['type'],

powerdnsadmin/routes/domain.py

@@ -1,6 +1,8 @@
 import re
 import json
 import traceback
+import dns.name
+import dns.reversename
 from distutils.version import StrictVersion
 from flask import Blueprint, render_template, make_response, url_for, current_app, request, redirect, abort, jsonify
 from flask_login import login_required, current_user
@@ -63,15 +65,27 @@ def domain(domain_name):
     if StrictVersion(Setting().get('pdns_version')) >= StrictVersion('4.0.0'):
         for r in rrsets:
             if r['type'] in records_allow_to_edit:
+                r_name = r['name'].rstrip('.')
+
+                # If it is reverse zone and pretty_ipv6_ptr setting
+                # is enabled, we reformat the name for ipv6 records.
+                if Setting().get('pretty_ipv6_ptr') and r[
+                        'type'] == 'PTR' and 'ip6.arpa' in r_name:
+                    r_name = dns.reversename.to_address(
+                        dns.name.from_text(r_name))
+
+                # Create the list of records in format that
+                # PDA jinja2 template can understand.
                 index = 0
                 for record in r['records']:
                     record_entry = RecordEntry(
-                        name=r['name'].rstrip('.'),
+                        name=r_name,
                         type=r['type'],
                         status='Disabled' if record['disabled'] else 'Active',
                         ttl=r['ttl'],
                         data=record['content'],
-                        comment=r['comments'][index]['content'] if r['comments'] else '',
+                        comment=r['comments'][index]['content']
+                        if r['comments'] else '',
                         is_allowed_edit=True)
                     index += 1
                     records.append(record_entry)
@@ -79,7 +93,7 @@ def domain(domain_name):
         # Unsupported version
         abort(500)
 
-    if not re.search('ip6\.arpa|in-addr\.arpa$', domain_name):
+    if not re.search(r'ip6\.arpa|in-addr\.arpa$', domain_name):
         editable_records = forward_records_allow_to_edit
     else:
         editable_records = reverse_records_allow_to_edit

powerdnsadmin/routes/index.py

@@ -1,4 +1,5 @@
 import os
+import re
 import json
 import traceback
 import datetime
@@ -423,7 +424,7 @@ def dyndns_update():
 
     domain = None
     domain_segments = hostname.split('.')
-    for index in range(len(domain_segments)):
+    for _index in range(len(domain_segments)):
         full_domain = '.'.join(domain_segments)
         potential_domain = Domain.query.filter(
             Domain.name == full_domain).first()
@@ -489,12 +490,23 @@ def dyndns_update():
                     DomainSetting.setting == 'create_via_dyndns').first()
             if (ondemand_creation is not None) and (strtobool(
                     ondemand_creation.value) == True):
-                record = Record(name=hostname,
-                                type=rtype,
-                                data=str(ip),
-                                status=False,
-                                ttl=3600)
-                result = record.add(domain.name)
+
+                # Build the rrset
+                rrset_data = [{
+                    "changetype": "REPLACE",
+                    "name": hostname + '.',
+                    "ttl": 3600,
+                    "type": rtype,
+                    "records": [{
+                        "content": str(ip),
+                        "disabled": False
+                    }],
+                    "comments": []
+                }]
+
+                # Format the rrset
+                rrset = {"rrsets": rrset_data}
+                result = Record().add(domain.name, rrset)
                 if result['status'] == 'ok':
                     history = History(
                         msg=
@@ -679,7 +691,7 @@ def handle_account(account_name):
     clean_name = ''.join(c for c in account_name.lower()
                          if c in "abcdefghijklmnopqrstuvwxyz0123456789")
     if len(clean_name) > Account.name.type.length:
-        logging.error(
+        current_app.logger.error(
             "Account name {0} too long. Truncated.".format(clean_name))
     account = Account.query.filter_by(name=clean_name).first()
     if not account: