Changeset 532 for trunk

Timestamp:

09/26/13 16:50:54 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Expand _template4_expand a little to match potential usage
Move "quick" hostname validation into a sub to handle validating template

hostnames and "@"

Add help link and reference page for rDNS templates on record add/edit page

Location:

trunk

Files:

• DNSDB.pm (modified) (4 diffs)
• UPGRADE (modified) (1 diff)
• reverse-patterns.html (added)
• templates/dns.css (modified) (1 diff)
• templates/record.tmpl (modified) (2 diffs)

trunk/DNSDB.pm

@@ -1231 +1231 @@
   #major patterns:
   #dashed IP, forward and reverse
+  #underscoreed IP, forward and reverse
   #dotted IP, forward and reverse (even if forward is... dumb)
-  # -> %r for reverse, %i for forward, leading - or . to indicate separator, defaults to -
+  # -> %r for reverse, %i for forward, leading -, _, or . to indicate separator, defaults to -
   # %r or %-r   => %4d-%3d-%2d-%1d
+  # %_r         => %4d_%3d_%2d_%1d
   # %.r         => %4d.%3d.%2d.%1d
   # %i or %-i   => %1d-%2d-%3d-%4d
+  # %_i         => %1d_%2d_%3d_%4d
   # %.i         => %1d.%2d.%3d.%4d
   $$tmpl =~ s/\%r/\%4d-\%3d-\%2d-\%1d/g;
-  $$tmpl =~ s/\%([-.])r/\%4d$1\%3d$1\%2d$1\%1d/g;
+  $$tmpl =~ s/\%([-._])r/\%4d$1\%3d$1\%2d$1\%1d/g;
   $$tmpl =~ s/\%i/\%1d-\%2d-\%3d-\%4d/g;
-  $$tmpl =~ s/\%([-.])i/\%1d$1\%2d$1\%3d$1\%4d/g;
+  $$tmpl =~ s/\%([-._])i/\%1d$1\%2d$1\%3d$1\%4d/g;
 
   #hex-coded IP
@@ -1260 +1263 @@
   $$tmpl =~ s/\%([1234])0/$ippad[$1-1]/g;
 } # _template4_expand()
+
+# Broad syntactic check on the hostname.  Checks for valid characters, correctly-expandable template patterns.
+# Takes the hostname, type, and live/default and forward/reverse flags
+# Returns true/false, sets errstr on failures
+sub _check_hostname_form {
+  my ($hname,$rectype,$defrec,$revrec) = @_;
+
+  if ($hname =~ /\%/ && ($rectype == 65282 || $rectype == 65283) ) {
+    my $tmphost = $hname;
+    # we don't actually need to test with the real IP passed;  that saves a bit of fiddling.
+    _template4_expand(\$tmphost, '10.10.10.10');
+    if ($tmphost =~ /\%/) {
+      $errstr = "Invalid template $hname";
+      return;
+    }
+  } elsif ($revrec eq 'y') {
+    # Reverse zones don't support @ in hostnames
+    # Also skip failure on revzone TXT records;  the hostname contains the TXT content in that case.
+    if ($rectype != $reverse_typemap{TXT} && lc($hname) !~ /^[0-9a-z_.-]+$/) {
+      $errstr = "Hostnames may not contain anything other than (0-9 a-z . _)";
+      return;
+    }
+  } else {
+    if (lc($hname) !~ /^(?:[0-9a-z_.-]+|@)$/) {
+      # Don't mention @, because it would be far too wordy to explain the nuance of @
+      $errstr = "Hostnames may not contain anything other than (0-9 a-z . _)";
+      return;
+    }
+  }
+  return 1;
+} # _check_hostname_form()
 
 
@@ -3670 +3704 @@
   return ('FAIL', "TTL must be numeric") unless $ttl =~ /^\d+$/;
 
-  # Quick check on hostname parts.  Note the regex is more forgiving than the error message;
-  # domain names technically are case-insensitive, and we use printf-like % codes for a couple
-  # of types.  Other things may also be added to validate default records of several flavours.
-  return ('FAIL', "Hostnames may not contain anything other than (0-9 a-z . _)")
-        if $defrec eq 'n' && ($revrec eq 'y' ? $$rectype != $reverse_typemap{TXT} : 1) &&
-                $$host !~ /^(?:[0-9a-z_%.-]+|@)$/i;
+  # Quick check on hostname parts.  There are enough variations to justify a sub now.
+  return ('FAIL', $errstr) if ! _check_hostname_form($$host, $$rectype, $defrec, $revrec);
 
   # Collect these even if we're only doing a simple A record so we can call *any* validation sub
@@ -3807 +3837 @@
   return ('FAIL', "TTL must be numeric") unless $ttl =~ /^\d+$/;
 
-  # Quick check on hostname parts.  Note the regex is more forgiving than the error message;
-  # domain names technically are case-insensitive, and we use printf-like % codes for a couple
-  # of types.  Other things may also be added to validate default records of several flavours.
-  return ('FAIL', "Hostnames may not contain anything other than (0-9 a-z - . _)")
-        if $defrec eq 'n' && ($revrec eq 'y' ? $$rectype != $reverse_typemap{TXT} : 1) &&
-                $$host !~ /^(?:[0-9a-z_%.-]+|@)$/i;
+  # Quick check on hostname parts.  There are enough variations to justify a sub now.
+  return ('FAIL', $errstr) if ! _check_hostname_form($$host, $$rectype, $defrec, $revrec);
 
   # only MX and SRV will use these

trunk/UPGRADE

@@ -1 +1 @@
 $Id$
 
-Upgrading from a previous release
-=================================
+DeepNet DNS Administrator - Upgrade Notes
+=========================================
 
 1.0 -> 1.2

trunk/templates/dns.css

@@ -36 +36 @@
         background-color: #F0F0F0;
 }
-table.container {
+.container {
         background-color: #FFFFFF;
         border: none;

trunk/templates/record.tmpl

@@ -27 +27 @@
 <TMPL_IF fwdzone>
                 <td>Hostname</td>
-                <td><input type="text" name="name" value="<TMPL_VAR NAME=name>" size="30" /></td>
+                <td><input type="text" name="name" value="<TMPL_VAR NAME=name>" size="30" />&nbsp; &nbsp; <a href="reverse-patterns.html">?</a></td>
 <TMPL_ELSE>
                 <td>IP Address</td>
@@ -47 +47 @@
 <TMPL_ELSE>
                 <td>Hostname</td>
-                <td><input type="text" name="name" value="<TMPL_VAR NAME=name>" size="30" /></td>
+                <td><input type="text" name="name" value="<TMPL_VAR NAME=name>" size="30" />&nbsp; &nbsp; <a href="reverse-patterns.html">?</a></td>
 </TMPL_IF>
         </tr>