Changeset 813 for trunk

Timestamp:

11/24/20 17:29:20 (4 years ago)

Author:

Kris Deugau

Message:

/trunk

Sixth sampled iteration of bind-import

File:

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

trunk/bind-import

@@ -31 +31 @@
 
 my $zname = shift @ARGV;
+die "usage: bind-import zonename\n" if !$zname;
 my $rev = 'n';
 my $zid;
@@ -66 +67 @@
 my $curlabel = '';
 
+my $i = 0;
+
 while (<>) {
   chomp;
   next if /^\s*$/;
-  next if /^\s*;/;
+  next if /^\s*;/;      # comments
+  next if /^\s*\(/;     # SOA closing.  arguably should do some more targeted voodoo when parsing the SOA details
+
   if (my ($macro,$mdetail) = (/^\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
@@ -96 +101 @@
     next;
   }
+  my $origrec = $_;
   # skip stale records that have no value
   next if /^ip-192-168-1(12|20)-\d+/;
@@ -101 +107 @@
   # records must begin in the first column, no leading whitespace
   my ($name) = /^([\w\@_.-]+)\s/;
+
+print "$i ($_)\n\t$name";
+# foo IN A 1.2.3.4
+#   IN A 2.3.4.5
+# =
+# foo.zone. IN A 1.2.3.4
+# foo.zone. IN A 2.3.4.5
+
+
+  # magic name!
+  $name = $zname if $name eq '@';
+
   # append zone name to record name if missing AND not dot-terminated;
   # this happens automagically for forward zones, but not reverse because Reasons.  (fixme?)
   # suck up and deal with the error if the dot-termiated name is out of zone;  should be
   # impossible with valid BIND zone file but...
-  $name .= ".$zname" if $name !~ /$zname$/ && $zname !~ /\.$/;
-$name = $zname if /^\s*IN/;
-$name = $zname if /^\@/;
+  if ($name !~ /\.$/) {
+    $name .= ".$zname" if $name !~ /$zname$/;
+  } else {
+    warn "skipping out-of-zone record:\n\t($_)\n" if $name !~ /$zname\.$/;
+    next;
+  }
+
+  # fatal error.  if there is no previous label, we can by definition not set
+  # the current label based on it.  this can only happen on the very first
+  # record, following records will *ALWAYS* have a previous label
+  if (/^\s+[A-Z]/) {
+    die "bad first record ($_):  no previous label\n" if !$prevlabel;
+    $name = $prevlabel;
+  }
+
+last if $i > 2;
+
   s/^([\w\@_.-]+)\s+//;
+
+$prevlabel = $curlabel;
 # by convention the optional TTL leads the optional class, but they're apparently swappable.
   my ($ttl) = /^(\d+)?\s/;
@@ -124 +158 @@
     }
     if ($class ne 'IN') {
-      print "Non-Internet class records not supported, you weirdo\n";
+      warn "Non-Internet class ($class) records not supported:\n\t$origrec\n";
       next;
     }
@@ -133 +167 @@
   my ($type) = /([A-Z-]+)\s/;
   if (!$reverse_typemap{$type}) {
-    print "Unknown type $type, skipping\n  ($_)\n";
+    warn "Unknown type $type, skipping\n\t($_)\n";
     next;
   }
@@ -162 +196 @@
 
   if ($type eq 'SOA') {
-
-  }
+    my ($ns, $adminmail) = ($rdata =~ /([\w.]+)\s+([\w.]+)\s+\(/);
+    die "Can't parse gibberish SOAish record: $_\n" if !$ns;
+    $rdata =~ s/([\w.]+)\s+([\w.]+)\s+\(\s*//;
+
+    # There are probably more efficient ways to do this but the SOA record
+    # format is essentially character based, not line-based.
+    # In theory the SOA serial etc may be spread over up to 5 lines, in any combination.
+
+    # Parse fields from $rdata if present
+    my @soabits;
+    my @soafirst = split /\s+/, $rdata;
+    while (my $f = shift @soafirst) {
+      last if $f !~ /^\d/;
+      push @soabits, $f;
+    }
+
+    # Read more lines if we don't have enough SOA fields filled
+    while (scalar(@soabits) < 5) {
+      my $tmp = <>;
+      $tmp =~ s/^\s*//;
+      my @tmpsoa = split /\s+/, $tmp;
+      while (my $f = shift @tmpsoa) {
+        last if $f !~ /^\d/;
+        push @soabits, $f;  
+      }
+      if (scalar(@soabits) == 5) {
+        last;
+      }
+    }
+  } # SOA
 
   # Quotes may arguably be syntactically required, but they're not actually part of the record data
-  if ($itype == 16) {
+  elsif ($type eq 'TXT') {
     $rdata =~ s/^"//;
     $rdata =~ s/"$//;
@@ -172 +234 @@
 
 # temp hack for hosts file
-if ($type eq 'A') {
+elsif ($type eq 'A') {
 #  if ($amap{$name}) {
 #    print "urp:  dupe name $name $rdata\n";
@@ -180 +242 @@
   push @{$namemap{$rdata}}, $name;
 }
-if ($type eq 'CNAME') {
+elsif ($type eq 'CNAME') {
   push @{$cmap{$rdata}}, $name;
 }
@@ -198 +260 @@
     print "$code: $msg\n";
   }
+  $i++;
 }