Changeset 601 for trunk

Timestamp:

03/25/14 17:29:06 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Update AXFR import reverse zone name detection:

• allow IPv6 CIDR "zones" instead of requiring the .arpa name
• IPv4, leading-octet (eg 192.168.42 will be treated as 192.168.42.0/24)
• IPv6, leading-quad format similar to the IPv4 leading-octet above
• Return the zone name we couldn't interpret, mainly for RPC or API callers as the web UI should be pretty clear on which errors/warnings go with with requested zone name

File:

• trunk/DNSDB.pm (modified) (3 diffs)

trunk/DNSDB.pm

@@ -4647 +4647 @@
 # Handles sub-octet v4 zones in the format specified in the Cricket Book, 2nd Ed, p217-218
 
-  if ($zone =~ m{(?:\.arpa\.?|/\d+)$}) {
+  if ($zone =~ m{(?:\.arpa\.?|/\d+|^[\d.]+|^[a-fA-F0-9:]+)$}) {
     # we seem to have a reverse zone
     $rev = 'y';
@@ -4660 +4660 @@
       $cidr = NetAddr::IP->new($zone) or return ('FAIL',"$zone is not a valid CIDR block");
       $zone = _ZONE($cidr, 'ZONE.in-addr.arpa', 'r', '.');
+    } elsif ($zone =~ /^[\d.]+$/) {
+      # v4 revzone, leading-octet format
+      my $mask = 32;
+      while ($zone !~ /^\d+\.\d+\.\d+\.\d+$/) {
+        $zone .= '.0';
+        $mask -= 8;
+      }
+      $zone .= "/$mask";
+      $cidr = NetAddr::IP->new($zone) or return ('FAIL',"$zone is not a valid CIDR block");
+      $zone = _ZONE($cidr, 'ZONE.in-addr.arpa', 'r', '.');
     } elsif ($zone =~ m|^[a-fA-F\d:]+/\d+$|) {
       # v6 revzone, CIDR netblock
@@ -4665 +4675 @@
       return ('FAIL', "$zone is not a nibble-aligned block") if $cidr->masklen % 4 != 0;
       $zone = _ZONE($cidr, 'ZONE.ip6.arpa', 'r', '.');
+    } elsif ($zone =~ /^[a-fA-F\d:]+$/) {
+      # v6 revzone, leading-group format
+      $zone =~ s/::$//;
+      my $mask = 128;
+      while ($zone !~ /^(?:[a-fA-F\d]{1,4}:){7}[a-fA-F\d]$/) {
+        $zone .= ":0";
+        $mask -= 16;
+      }
+      $zone .= "/$mask";
+      $cidr = NetAddr::IP->new($zone) or return ('FAIL',"$zone is not a valid CIDR block");
+      $zone = _ZONE($cidr, 'ZONE.ip6.arpa', 'r', '.');
     } else {
       # there is. no. else!
-      return ('FAIL', "Unknown zone name format");
-    }
+      return ('FAIL', "Unknown zone name format '$zone'");
+    }
+
+    # several places this can be triggered from;  better to do it once.
+    $warnmsg .= "Apparent sub-/64 IPv6 reverse zone\n" if $cidr->masklen > 64;
 
     # quick check to start to see if we've already got one