Changeset 302 for trunk

Timestamp:

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

Author:

Kris Deugau

Message:

/trunk

Checkpoint converting importAXFR() to support reverse zones

• added "merge A/AAAA and PTR records" functionality
• Flip NS and CNAME records around if importing a revzone so they display properly
• Consider dropping CNAMEs in revzones since they're essentially an implementation hack, and not really part of the logical delegation chain
• Clean up some commented stale code

[ log -> ticket fixup: see #26 ]

File:

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

trunk/DNSDB.pm

@@ -3236 +3236 @@
 
   my $rev = 'n';
-my $code = 'OK';
-my $msg = 'foobar?';
+  my $code = 'OK';
+  my $msg = 'foobar?';
 
   # choke on possible bad setting in ifrom
@@ -3348 +3348 @@
       $nsflag = 1 if $type eq 'NS';
 
-#      my @vallist = ($zone_id, $rr->name, $reverse_typemap{$type}, $rr->ttl);
-
 # "Primary" types:
 # A, NS, CNAME, SOA, PTR(warn in forward), MX, TXT, AAAA, SRV, A6(ob), SPF
 # maybe KEY
+
+# BIND supports:
+# [standard]
+# A AAAA CNAME MX NS PTR SOA TXT
+# [variously experimental, obsolete, or obscure]
+# HINFO MB(ex) MD(ob) MF(ob) MG(ex) MINFO(ex) MR(ex) NULL WKS AFSDB(ex) ISDN(ex) RP(ex) RT(ex) X25(ex) PX
+# ... if one can ever find the right magic to format them correctly
+
+# Net::DNS supports:
+# RRSIG SIG NSAP NS NIMLOC NAPTR MX MR MINFO MG MB LOC ISDN IPSECKEY HINFO
+# EID DNAME CNAME CERT APL AFSDB AAAA A DS NXT NSEC3PARAM NSEC3 NSEC KEY
+# DNSKEY DLV X25 TXT TSIG TKEY SSHFP SRV SPF SOA RT RP PX PTR NULL APL::AplItem
 
 # nasty big ugly case-like thing here, since we have to do *some* different
@@ -3364 +3374 @@
 # hmm.  should we warn here if subdomain NS'es are left alone?
         next if ($rwns && ($rr->name eq $zone));
-        $val = $rr->nsdname;
+        if ($rev eq 'y') {
+          # revzones have records more or less reversed from forward zones.
+          my ($tmpcode,$tmpmsg) = _zone2cidr($host);
+          die "Error converting NS record: $tmpmsg" if $tmpcode eq 'FAIL';      # hmm.  may not make sense...
+          $val = "$tmpmsg";
+          $host = $rr->nsdname;
+        } else {
+          $val = $rr->nsdname;
+        }
         $nsflag = 1;
       } elsif ($type eq 'CNAME') {
-        $val = $rr->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 =~ /\*$/;
+}
+        
+        } else {
+          $val = $rr->cname;
+        }
       } elsif ($type eq 'SOA') {
         next if $rwsoa;
@@ -3419 +3465 @@
       }
 
-# BIND supports:
-# [standard]
-# A AAAA CNAME MX NS PTR SOA TXT
-# [variously experimental, obsolete, or obscure]
-# HINFO MB(ex) MD(ob) MF(ob) MG(ex) MINFO(ex) MR(ex) NULL WKS AFSDB(ex) ISDN(ex) RP(ex) RT(ex) X25(ex) PX
-# ... if one can ever find the right magic to format them correctly
-
-# Net::DNS supports:
-# RRSIG SIG NSAP NS NIMLOC NAPTR MX MR MINFO MG MB LOC ISDN IPSECKEY HINFO
-# EID DNAME CNAME CERT APL AFSDB AAAA A DS NXT NSEC3PARAM NSEC3 NSEC KEY
-# DNSKEY DLV X25 TXT TSIG TKEY SSHFP SRV SPF SOA RT RP PX PTR NULL APL::AplItem
-
-#      $sth = $dbh->prepare($sql.") VALUES (".$vallen.")")
-#       or die "problem preparing record insert SQL: ".$dbh->errstr."\n";
-#      $sth->execute(@vallist) or die "failed to insert ".$rr->string.": ".$sth->errstr."\n";
-
+      my $logentry = "[AXFR $zone] ";
+
+$merge = 1;
+if ($merge) {
+  if ($rev eq 'n') {
+    # importing a domain;  we have A and AAAA records that could be merged with matching PTR records
+    my $etype;
+    my ($erdns,$erid,$ettl) = $dbh->selectrow_array("SELECT rdns_id,record_id,ttl FROM records ".
+        "WHERE host=? AND val=? AND type=12",
+        undef, ($host, $val) );
+    if ($erid) {
+      if ($type eq 'A') {       # PTR -> A+PTR
+        $etype = 65280;
+        $logentry .= "Merged A record with existing PTR record '$host A+PTR $val', TTL $ettl";
+      }
+      if ($type eq 'AAAA') {    # PTR -> AAAA+PTR
+        $etype = 65281;
+        $logentry .= "Merged AAAA record with existing PTR record '$host AAAA+PTR $val', TTL $ettl";
+      }
+      $ettl = ($ettl < $ttl ? $ettl : $ttl);    # use lower TTL
+      $dbh->do("UPDATE records SET domain_id=?,ttl=?,type=? WHERE record_id=?", undef,
+        ($domain_id, $ettl, $etype, $erid));
+      $nrecs++;
+      _log($dbh, (group_id => $group, domain_id => $domain_id, rdns_id => $erdns, entry => $logentry) );
+      next;     # while axfr_next
+    }
+  } else {
+    # importing a revzone, we have PTR records that could be merged with matching A/AAAA records
+    my ($domid,$erid,$ettl,$etype) = $dbh->selectrow_array("SELECT domain_id,record_id,ttl,type FROM records ".
+        "WHERE host=? AND val=? AND (type=1 OR type=28)",
+        undef, ($host, $val) );
+    if ($erid) {
+      if ($etype == 1) {        # A -> A+PTR
+        $etype = 65280;
+        $logentry .= "Merged PTR record with existing matching A record '$host A+PTR $val', TTL $ettl";
+      }
+      if ($etype == 28) {       # AAAA -> AAAA+PTR
+        $etype = 65281;
+        $logentry .= "Merged PTR record with existing matching AAAA record '$host AAAA+PTR $val', TTL $ettl";
+      }
+      $ettl = ($ettl < $ttl ? $ettl : $ttl);    # use lower TTL
+      $dbh->do("UPDATE records SET rdns_id=?,ttl=?,type=? WHERE record_id=?", undef,
+        ($rdns_id, $ettl, $etype, $erid));
+      $nrecs++;
+      _log($dbh, (group_id => $group, domain_id => $domid, rdns_id => $rdns_id, entry => $logentry) );
+      next;     # while axfr_next
+    }
+  }
+}
+
+      # Insert the new record
       $sth->execute($domain_id, $rdns_id, $host, $reverse_typemap{$type}, $val,
         $distance, $weight, $port, $ttl);
@@ -3440 +3521 @@
       $nrecs++;
 
-      my $logentry = "[AXFR $zone] ";
       if ($type eq 'SOA') {
         # also !$rwsoa, but if that's set, it should be impossible to get here.
@@ -3487 +3567 @@
     die "Bad zone:  No NS records!\n" if !$nsflag;
 
+#die "horribly\n";
     $dbh->commit;
 
@@ -3503 +3584 @@
   return ('WARN',"OOOK!");
 } # end importAXFR()
+
+
+## DNSDB::importBIND()
+sub importBIND {
+} # end importBIND()
+
+
+## DNSDB::import_tinydns()
+sub import_tinydns {
+} # end import_tinydns()