Changeset 818 for trunk

Timestamp:

12/03/20 13:53:22 (4 years ago)

Author:

Kris Deugau

Message:

/trunk

Eleventh sampled iteration of bind-import

File:

• trunk/bind-import (modified) (15 diffs)

trunk/bind-import

@@ -1 +1 @@
 #!/usr/bin/perl
 # Import a BIND zone file
+# Note we are not using Net:DNS::ZoneFile, because we want to convert $GENERATE
+# directives straight into PTR template or A+PTR template metarecords
 ##
 # Copyright 2020 Kris Deugau <kdeugau@deepnet.cx>
@@ -57 +59 @@
   $zid = $dnsdb->revID($zname,':ANY:');
   if ($zid) {
-    die "zone $origzone already present, not merging records\n";
+#    die "zone $origzone already present, not merging records\n";
 #$zname = new NetAddr::IP $zname;
 #    $zname = DNSDB::_ZONE($zname, 'ZONE', 'r', '.').($zname->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
   }
-  $zid = $dnsdb->{dbh}->do("INSERT INTO revzones (revnet,group_id,status,default_location,zserial) VALUES (?,?,?,?,?) RETURNING rnds_id",
-                undef, ($zname, $group, $status, $location, $serial));
+#  $zid = $dnsdb->{dbh}->do("INSERT INTO revzones (revnet,group_id,status,default_location,zserial) VALUES (?,?,?,?,?) RETURNING rnds_id",
+#                undef, ($zname, $group, $status, $location, $serial));
 
 } else {
   $zid = $dnsdb->domainID($zname,':ANY:');
   if ($zid) {
-    die "zone $origzone already present, not merging records\n";
-  }
-  $zid = $dnsdb->{dbh}->do("INSERT INTO domains (domain,group_id,status,default_location,zserial) VALUES (?,?,?,?,?) RETURNING domain_id",
-                undef, ($zname, $group, $status, $location, $serial));
+#    die "zone $origzone already present, not merging records\n";
+  }
+#  $zid = $dnsdb->{dbh}->do("INSERT INTO domains (domain,group_id,status,default_location,zserial) VALUES (?,?,?,?,?) RETURNING domain_id",
+#                undef, ($zname, $group, $status, $location, $serial));
 }
 
@@ -85 +87 @@
 my $defttl = $zonettl;
 my $origin = "$zname."; # to append to unqualified names
+my %foundtypes;
 
 # need to spin up a full state machine-ish thing, because BIND zone files are all about context
@@ -100 +103 @@
                                 # arguably should do some more targeted voodoo when parsing the SOA details
 
+##fixme:  use external skiplist
   # skip stale records that have no value
   next if /^ip-192-168-1(12|20)-\d+/;
   next if /ip.add.re.\d+\s*$/;
 
-#last if ++$i > 4;
-print "($rec)\n";
+$i++;
+#last if $i > 4;
+#print "line $i: ($rec)\n";
   if (my ($macro,$mdetail) = ($rec =~ /^\s*\$(TTL|ORIGIN|INCLUDE|GENERATE)\s+(.+)/) ) {
     # macro sort of thing;  $TTL and $ORIGIN most common.  $INCLUDE is a thing, expect it to be rare in live use tho
@@ -138 +143 @@
 
     }
+    elsif ($macro eq 'GENERATE') {
+# needs to generate CIDR range(s) as needed to match the start/stop points
+    }
     # not handling $INCLUDE or $GENERATE (altho the latter seems to be mostly a less-flexible version of the template types)
     next;
@@ -159 +167 @@
   # append $ORIGIN if name is not fully qualified.
   if ($curlabel !~ /\.$/) {
-    $curlabel .= ".$origin";
+    $curlabel .= ($origin eq '.' ? '.' : ".$origin");
   }
 print "  expanded '$curlabel'\n";
 
+# hack pthbptt
+#$curlabel =~ s/\.\.$/./;
   # check for zone scope.  skip bad records.
   if ($curlabel !~ /$zname.$/) {
@@ -192 +202 @@
 #  }
 
-print "$i ($rec)\n";#\t$curlabel";
+#print "$i ($rec)\n";#\t$curlabel";
 
 
@@ -211 +221 @@
   my $nc = 0;
   my $class = 'IN';
+  my $type;
   my $ttl;
-  my $type;
+  my $distance;
+  my $weight;
+  my $port;
   my $badrec;
   my $curatom = 'class';
@@ -269 +282 @@
   }
 
+##todo:  BIND conflates a repeated label with repeating the TTL too.  Matter of opinion whether that's really correct or not.
   # set default TTL here so we can detect a TTL in the loop above
   $ttl = $defttl if !defined($ttl);
@@ -278 +292 @@
 #$curlabel = $name;
 $prevlabel = $curlabel;
-##todo:  BIND conflates a repeated label with repeating the TTL too.  Matter of opinion whether that's really correct or not.
 
 
@@ -335 +348 @@
   #$ORIGIN example.invalid.
   #foo                     A       192.168.16.45
+$foundtypes{$type}++;
+
+##fixme:  strip trailing . here?  dnsadmin's normalized internal format omits it, some validation fails or may go funky
 
   if ($type eq 'SOA') {
@@ -366 +382 @@
       }
     }
+#  $dnsdb->{dbh}->do("UPDATE [zonetable] SET serial = ? WHERE [idfield] = ?");
+#  $dnsdb->{dbh}->do("INSERT INTO records () VALUES ()");
+#  next;
+#Zfqdn:mname:rname:ser:ref:ret:exp:min:ttl:timestamp:lo
+#print "Z$zname:$ns:$adminmail:$soabits[0]:$soabits[1]:$soabits[2]:$soabits[3]:$soabits[4]:$ttl\n";
   } # SOA
 
-  # Quotes may arguably be syntactically required, but they're not actually part of the record data
+
+  # we're using DNSDB::addrec(), so we'll skip detailed validation of other records.  Most won't need further breakdown
+
+  elsif ($type eq 'A') {
+#print "+$curlabel:$rdata:$ttl\n";
+  }
+
+  elsif ($type eq 'NS') {
+#print "\&$curlabel::$rdata:$ttl\n";
+  }
+
+  elsif ($type eq 'CNAME') {
+#print "C$curlabel:$rdata:$ttl\n";
+  }
+
+  elsif ($type eq 'PTR') {
+  }
+
+  elsif ($type eq 'MX') {
+    ($distance) = ($rdata =~ /^(\d+)\s+/);
+    if (!defined($distance)) {
+      warn "malformed MX record: $origrec, skipping\n";
+      next;
+    }
+    $rdata =~ s/^\d+\s+//;
+  }
+
   elsif ($type eq 'TXT') {
+    # Quotes may arguably be syntactically required, but they're not actually part of the record data
     $rdata =~ s/^"//;
     $rdata =~ s/"$//;
-  }
-
-# temp hack for hosts file
-elsif ($type eq 'A') {
-#  if ($amap{$name}) {
-#    print "urp:  dupe name $name $rdata\n";
-#  } else {
-    push @{$amap{$curlabel}}, $rdata;
-#  }
-  push @{$namemap{$rdata}}, $curlabel;
-}
-elsif ($type eq 'CNAME') {
-  push @{$cmap{$rdata}}, $curlabel;
-}
+#print "'$curlabel:$rdata:$ttl\n";
+  }
+
+  elsif ($type eq 'RP') {
+  }
+
+  elsif ($type eq 'AAAA') {
+  }
+
+  elsif ($type eq 'SRV') {
+    ($distance, $weight, $port) = ($rdata =~ /^(\d+)\s+(\d+)\s+(\d+)\s+/);
+    if ( !defined($distance) || !defined($weight) || !defined($port) ) {
+      warn "malformed SRV record: $origrec, skipping\n";
+      next;
+    }
+    $rdata =~ s/^\d+\s+\d+\s+\d+\s+//;
+  }
+
+  # basically a dedicated clone of TXT, not sure anything actually looks up type SPF.
+  # BIND autogenerates them from SPF TXT records.
+  elsif ($type eq 'SPF') {
+    # Quotes may arguably be syntactically required, but they're not actually part of the record data
+    $rdata =~ s/^"//;
+    $rdata =~ s/"$//;
+  }
+
+#  elsif ($type eq 'TXT') {
+#  elsif ($type eq 'TXT') {
+
+  else {
+    warn "unsupported type $type, may not import correctly\n";
+  }
 
 no warnings qw(uninitialized);
-#print "parsed: '$name' '$class' '$ttl' '$type'->'$itype' '$rdata'\n";
+#print "parsed: '$curlabel' '$class' '$ttl' '$type'->'$itype' '$rdata'\n";
 #print;
 #;imap   IN      900     CNAME   deepnet.cx.
@@ -395 +461 @@
     my ($code, $msg);
     if ($rev eq 'n') {
-      ($code,$msg) = $dnsdb->addRec('n', $rev, $zid, \$curlabel, \$itype, \$rdata, $ttl);
+      ($code,$msg) = $dnsdb->addRec('n', $rev, $zid, \$curlabel, \$itype, \$rdata, $ttl,
+        $location, undef, undef, $distance, $weight, $port);
     } else {
-      ($code,$msg) = $dnsdb->addRec('n', $rev, $zid, \$rdata, \$itype, \$curlabel, $ttl);
+      ($code,$msg) = $dnsdb->addRec('y', $rev, $zid, \$rdata, \$itype, \$curlabel, $ttl,
+        $location, undef, undef, $distance, $weight, $port);
     }
     print "$code: $msg\n";
@@ -409 +477 @@
 #print Dumper \%cmap;
 
-foreach my $n (keys %amap) {
-  foreach my $ip (@{$amap{$n}}) {
-#print "$ip     $n\n";
-    push @{$namemap{$ip}}, $n unless grep $n, @{$namemap{$ip}};
-  }
-}
-
-foreach my $c (keys %cmap) {
-  if ($amap{$c}) {
-    print Dumper(\@{$amap{$c}});
-  }
-#  print $amap{$c};
-}
+#foreach my $n (keys %amap) {
+#  foreach my $ip (@{$amap{$n}}) {
+##print "$ip    $n\n";
+#    push @{$namemap{$ip}}, $n unless grep $n, @{$namemap{$ip}};
+#  }
+#}
+
+#foreach my $c (keys %cmap) {
+#  if ($amap{$c}) {
+#    print Dumper(\@{$amap{$c}});
+#  }
+##  print $amap{$c};
+#}
 
 # cname targ -> IP
@@ -430 +498 @@
 
 $dnsdb->{dbh}->rollback;
+
+foreach my $t (keys %foundtypes) {
+  print "found $t: $foundtypes{$t}\n";
+}