Changeset 303 for trunk

Timestamp:

04/13/12 18:14:26 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint - still finding rough edges in AXFR import
[ log -> ticket fixup: see #26 ]

File:

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

trunk/DNSDB.pm

@@ -3294 +3294 @@
   return ('FAIL', ($rev eq 'n' ? 'Domain' : 'Reverse zone')." already exists") if $zone_id;
 
+  # little local utility sub to swap $val and $host for revzone records.
+  sub _revswap {
+    my $rechost = shift;
+    my $recdata = shift;
+
+    if ($rechost =~ /\.in-addr\.arpa\.?$/) {
+      $rechost =~ s/\.in-addr\.arpa\.?$//;
+      $rechost = join '.', reverse split /\./, $rechost;
+    } else {
+      $rechost =~ s/\.ip6\.arpa\.?$//;
+      my @nibs = reverse split /\./, $rechost;
+      $rechost = '';
+      my $nc;
+      foreach (@nibs) {
+        $rechost.= $_;
+        $rechost .= ":" if ++$nc % 4 == 0 && $nc < 32;
+      }
+$rechost .= ":" if $nc < 32 && $rechost !~ /\*$/;       # close netblock records?
+print "$rechost\n";
+      # canonicalize with NetAddr::IP
+      $rechost = NetAddr::IP->new($rechost)->addr unless $rechost =~ /\*$/;
+    }
+    return ($recdata,$rechost)
+  }
+
+
   # Allow transactions, and raise an exception on errors so we can catch it later.
   # Use local to make sure these get "reset" properly on exiting this block
@@ -3318 +3344 @@
       $rdns_id = $zone_id;
       _log($dbh, (group_id => $group, rdns_id => $rdns_id,
-                entry => "[Added ".($status ? 'active' : 'inactive')." reverse zone $zone via AXFR]") );
+                entry => "[Added ".($status ? 'active' : 'inactive')." reverse zone $cidr via AXFR]") );
     }
 
@@ -3340 +3366 @@
       my $weight = 0;
       my $port = 0;
+      my $logfrag = '';
 
       my $type = $rr->type;
@@ -3380 +3407 @@
           $val = "$tmpmsg";
           $host = $rr->nsdname;
+          $logfrag = "Added record '$val $type $host', TTL $ttl";
         } else {
           $val = $rr->nsdname;
@@ -3386 +3414 @@
       } elsif ($type eq 'CNAME') {
         if ($rev eq 'y') {
-
-# hmm.  do we even want to bother with storing these at this level?  Sub-octet delegation
-# by CNAME is essentially a record-publication hack, and we want to just represent the
-# "true" logical intentions as far down the stack as we can from the UI.
-
-# really wanna spin this bit off to somewhere common, since it's likely we'll need it
-# for more than CNAME and PTR...
-$val = $host;
-$host = $rr->cname;
-if ($val =~ /\.in-addr\.arpa\.?$/) {
-  $val =~ s/\.in-addr\.arpa\.?$//;
-  $val = join '.', reverse split /\./, $val;
-} else {
-  $val =~ s/\.ip6\.arpa\.?$//;
-  my @nibs = reverse split /\./, $val;
-  $val = '';
-  my $nc;
-  foreach (@nibs) {
-    $val .= $_;
-    $val .= ":" if ++$nc % 4 == 0 && $nc < 32;
-  }
-  # canonicalize with NetAddr::IP
-  $val = NetAddr::IP->new($val)->addr unless $val =~ /\*$/;
-}
-        
+          # hmm.  do we even want to bother with storing these at this level?  Sub-octet delegation
+          # by CNAME is essentially a record-publication hack, and we want to just represent the
+          # "true" logical intentions as far down the stack as we can from the UI.
+          ($host,$val) = _revswap($host,$rr->cname);
+          $logfrag = "Added record '$val $type $host', TTL $ttl";
         } else {
           $val = $rr->cname;
@@ -3420 +3428 @@
         $soaflag = 1;
       } elsif ($type eq 'PTR') {
-        $val = $host;
-        $host = $rr->ptrdname;
-        if ($val =~ /\.in-addr\.arpa\.?$/) {
-          $val =~ s/\.in-addr\.arpa\.?$//;
-          $val = join '.', reverse split /\./, $val;
-        } else {
-          $val =~ s/\.ip6\.arpa\.?$//;
-          my @nibs = reverse split /\./, $val;
-          $val = '';
-          my $nc;
-          foreach (@nibs) {
-            $val .= $_;
-            $val .= ":" if ++$nc % 4 == 0 && $nc < 32;
-          }
-          # canonicalize with NetAddr::IP
-          $val = NetAddr::IP->new($val)->addr unless $val =~ /\*$/;
-        }
+        ($host,$val) = _revswap($host,$rr->ptrdname);
+        $logfrag = "Added record '$val $type $host', TTL $ttl";
         # hmm.  PTR records should not be in forward zones.
       } elsif ($type eq 'MX') {
@@ -3444 +3437 @@
 ##fixme:  Net::DNS docs say this should be deprecated for rdatastr() or char_str_list(),
 ## but don't really seem enthusiastic about it.
-        $val = $rr->txtdata;
+#print "should use rdatastr:\n\t".$rr->rdatastr."\n  or char_str_list:\n\t".join(' ',$rr->char_str_list())."\n";
+# rdatastr returns a BIND-targetted logical string, including opening and closing quotes
+# char_str_list returns a list of the individual string fragments in the record
+# txtdata returns the more useful all-in-one form.
+# NB:  this may turn out to be more troublesome if we ever have need of >512-byte TXT records.
+        if ($rev eq 'y') {
+          ($host,$val) = _revswap($host,$rr->txtdata);
+          $logfrag = "Added record '$val $type $host', TTL $ttl";
+        } else {
+          $val = $rr->txtdata;
+        }
       } elsif ($type eq 'SPF') {
 ##fixme: and the same caveat here, since it is apparently a clone of ::TXT
@@ -3465 +3468 @@
       }
 
-      my $logentry = "[AXFR $zone] ";
+      my $logentry = "[AXFR ".($rev eq 'n' ? $zone : $cidr)."] ";
 
 $merge = 1;
@@ -3527 +3530 @@
         $logentry .= "Added SOA record [contact $tmp1[0]] [master $tmp1[1]] ".
                 "[refresh $tmp2[0]] [retry $tmp2[1]] [expire $tmp2[2]] [minttl $tmp2[3]], TTL $ttl";
+      } elsif ($logfrag) {
+        # special case for log entries we need to meddle with a little.
+        $logentry .= $logfrag;
       } else {
         $logentry .= "Added record '$host $type";