Changeset 602

Timestamp:

03/28/14 15:22:03 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Review and fix up handling of "any record, any zone" in AXFR import.
See #53.

File:

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

trunk/DNSDB.pm

@@ -4802 +4802 @@
       my $logfrag = '';
 
+      # Collect some record parts
       my $type = $rr->type;
       my $host = $rr->name;
       my $ttl = ($args{newttl} ? $args{newttl} : $rr->ttl);     # allow force-override TTLs
 
+      # Info flags for SOA and NS records
       $soaflag = 1 if $type eq 'SOA';
       $nsflag = 1 if $type eq 'NS';
@@ -4828 +4830 @@
 # processing depending on the record.  le sigh.
 
+# do the initial processing as if the record was in a forward zone.  If we're
+# doing a revzone, we can flip $host and $val as needed, once, after this
+# monster if-elsif-...-elsif-else.  This actually simplifies things a lot.
+
 ##fixme:  what record types other than TXT can/will have >255-byte payloads?
 
@@ -4834 +4840 @@
       } elsif ($type eq 'NS') {
 # hmm.  should we warn here if subdomain NS'es are left alone?
-        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\n" if $tmpcode eq 'FAIL';    # hmm.  may not make sense...
-          next if ($args{rwns} && ($tmpmsg eq "$cidr"));
-          $val = "$tmpmsg";
-          $host = $rr->nsdname;
-          $logfrag = "Added record '$val $type $host', TTL $ttl";
-# Tag and preserve.  For now this is commented for a no-op, but we have Ideas for
-# another custom storage type ("DELEGATE") that will use these subzone-delegation records
-#if ($val ne "$cidr") {
-#  push @{$suboct{$val}{ns}}, $host;
-#}
-        } else {
-          next if ($args{rwns} && ($rr->name eq $zone));
-          $val = $rr->nsdname;
-        }
+        next if ($args{rwns} && ($host eq $zone));
+        $val = $rr->nsdname;
         $nsflag = 1;
       } 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.
-          ($host,$val) = _revswap($host,$rr->cname);
-          $logfrag = "Added record '$val $type $host', TTL $ttl";
-# Tag and preserve in case we want to commit them as-is later, but mostly we don't care.
-# Commented pending actually doing something with possibly new type DELEGATE
-#my $tmprev = $host;
-#$tmprev =~ s/^\d+\.//;
-#($code,$tmprev) = _zone2cidr($tmprev);
-#push @{$suboct{"$tmprev"}{cname}}, $val;
-          # Silently skip CNAMEs in revzones.
-          next;
-        } else {
-          $val = $rr->cname;
-        }
+        $val = $rr->cname;
       } elsif ($type eq 'SOA') {
         next if $args{rwsoa};
@@ -4876 +4851 @@
         $soaflag = 1;
       } elsif ($type eq 'PTR') {
-        ($host,$val) = _revswap($host,$rr->ptrdname);
-        $logfrag = "Added record '$val $type $host', TTL $ttl";
-        # hmm.  PTR records should not be in forward zones.
+        $val = $rr->ptrdname;
       } elsif ($type eq 'MX') {
         $val = $rr->exchange;
@@ -4891 +4864 @@
 # details as far down the stack as we can)
 # 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;
-        }
+        $val = $rr->txtdata;
       } elsif ($type eq 'SPF') {
 ##fixme: and the same caveat here, since it is apparently a clone of ::TXT
@@ -4916 +4884 @@
         $warnmsg .= "Unusual record ".$rr->name." ($type) found\n";
       }
+
+      if ($rev eq 'y' && $type ne 'SOA') {
+        # up to this point we haven't meddled with the record's hostname part or rdata part.
+        # for reverse records, (except SOA) we must swap the two.
+        $host = $val;
+        $val = $rr->name;
+        my ($tmpcode,$tmpmsg) = _zone2cidr($val);
+        if ($tmpcode eq 'FAIL') {
+          # $val did not have a valid IP value.  It's syntactically valid but WTF?
+          $warnmsg .= "Suspect record '".$rr->string."' may not be imported correctly: $tmpmsg\n";
+        } else {
+          # $val has a valid IP value.  See if we can store it as that IP value.
+          # Note we're enumerating do-nothing cases for clarity.
+##enhance:  this is where we will implement the more subtle variations on #53
+          if ($type ne 'PTR' && $type ne 'NS' && $type ne 'CNAME' && $type ne 'TXT') {
+            # case: the record is "weird" - ie, not a PTR, NS, CNAME, or TXT
+            # $warnmsg .= "Discarding suspect record '".$rr->string."'\n" if $self->{strict} eq 'full';
+          } elsif ($type eq 'PTR' && $tmpmsg->masklen != 32 && $tmpmsg->masklen != 128) {
+            # case: PTR with netblock value, not IP value
+            # eg, "@ PTR foo" in zone f.e.e.b.d.a.e.d.ip6.arpa should not be
+            # stored/displayed as dead:beef::/32 PTR foo
+
+## hrm.  WTF is this case for, anyway?  Needs testing to check the logic.
+#          } elsif ( ($type eq 'PTR' || $type eq 'NS' || $type eq 'CNAME' || $type eq 'TXT') &&
+#                    ($tmpmsg->masklen != $cidr->masklen) 
+#                  ) {
+#            # leave $val as-is if the record is "normal" (a PTR, NS, CNAME, or TXT),
+#            # and the mask does not match the zone
+#$warnmsg .= "WTF case: $host $type $val\n";
+#            # $warnmsg .= "Discarding suspect record '".$rr->string."'\n" if $self->{strict} eq 'full';
+
+          } else {
+            $val = $tmpmsg;
+            $val =~ s/\/(?:32|128)$//;  # automagically converts $val back to a string before s///
+            #$val =~ s/:0$//g;
+          }
+        }
+        # magic?  convert * records to PTR template (not sure this actually makes sense)
+        #if ($val =~ /^\*/) {
+        #  $val =~ s/\*\.//;
+        #  ($tmpcode,$tmpmsg) = _zone2cidr($val);
+        #  if ($tmpcode eq 'FAIL') {
+        #    $val = "*.$val";
+        #    $warnmsg .= "Suspect record '".$rr->string."' may not be converted to PTR template correctly: $tmpmsg\n";
+        #  } else {
+        #    $type = 'PTR template';
+        #    $val = $tmpmsg; if $tmp
+        #    $val =~ s/\/(?:32|128)$//;  # automagically converts $val back to a string before s///
+        #  }
+        #}
+      } # non-SOA revrec $host/$val inversion and munging
 
       my $logentry = "[AXFR ".($rev eq 'n' ? $zone : $cidr)."] ";
@@ -4983 +5002 @@
         $logentry .= $logfrag;
       } else {
-        $logentry .= "Added record '$host $type";
+        $logentry .= "Added record '".($rev eq 'y' ? $val : $host)." $type";
         $logentry .= " [distance $distance]" if $type eq 'MX';
         $logentry .= " [priority $distance] [weight $weight] [port $port]" if $type eq 'SRV';
-        $logentry .= " $val', TTL $ttl";
+        $logentry .= " ".($rev eq 'y' ? $host : $val)."', TTL $ttl";
       }
       $self->_log(group_id => $group, domain_id => $domain_id, rdns_id => $rdns_id, entry => $logentry);