Changeset 800

Timestamp:

11/05/20 17:07:56 (3 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit 2nd archived iteration of bind2hosts in development

File:

• trunk/bind2hosts (modified) (2 diffs)

trunk/bind2hosts

@@ -68 +68 @@
   next if /^\s*$/;
   next if /^\s*;/;
+  next if /^\s*\)/;     # SOA closing (possibly other records too?)
+                        # arguably should do some more targeted voodoo when parsing the SOA details
+
   if (my ($macro,$mdetail) = (/^\s*\$(TTL|ORIGIN|INCLUDE)\s+(.+)/) ) {
     # macro sort of thing;  $TTL and $ORIGIN most common.  $INCLUDE is a thing, expect it to be rare in live use tho
     if ($macro eq 'TTL') {
-      if ($mdetail =~ /^\d+$/) {
-        $defttl = $mdetail;
+      # irrelevant for a hosts file
+    } elsif ($macro eq 'ORIGIN') {
+      # $ORIGIN supports cascading/nesting, by watching for fully-qualified names vs partial names.
+      if ($mdetail =~ /\.$/) {
+        $origin = $mdetail;
       } else {
-        warn "invalid \$TTL: $_\n";
-      }
-    } elsif ($macro eq 'ORIGIN') {
-##fixme:  going to skip the stupid case of "$ORIGIN com." and the like that lie
-# between . and the root domain we were told we're importing;  anyone using such
-# a mess outside the root servers is clearly insane
-# handled cases:
-#   $ORIGIN .
-#   $ORIGIN [zonedomain].
-#   $ORIGIN [subdomain.zonedomain].
-      if ($mdetail eq '.' || $mdetail =~ /$zname\.$/ || $zname =~ /$mdetail\.$/) {
-        $recbase = $mdetail;
-      } else {
-        # if we continue, we either use an $ORIGIN that's out of zone, or ignore it and potentially publish incorrect records.
-        die "bad \$ORIGIN: $_\n";
+        # append current origin to unqualified origin
+        $origin = "$mdetail.$origin";
       }
     }
+##fixme: should arguably handle $INCLUDE
+# probably NOT going to handle $GENERATE, since that type of record set is best handled in DNS
     next;
   }
-  # skip stale records that have no value
-#  next if /^ip-\d+-\d+-\d+/;
-#  next if /^ip.pre.fix.\d+.static.colo/;
+
+  my $origrec = $_;
+
+##fixme:  convert to optional skipfile?
+# skip stale records that have no value
+#next if /^ip-\d+-\d+-\d+/;
+#next if /^ip.pre.fix.\d+.static.colo/;
+
+  # leading whitespace indicates "same label as last record"
+  if (/^\s/) {
+    $curlabel = $prevlabel;
+  } else {
+    ($curlabel) = /^([\w\@_.-]+)\s/;
+  }
+
+  # magic name!
+  $curlabel = "$zname." if $curlabel eq '@';
+
+  # append $ORIGIN if name is not fully qualified.
+  if ($curlabel !~ /\.$/) {
+    $curlabel .= $origin;
+  }
+
+  # check for zone scope.  skip bad records.
+  if ($curlabel !~ /$zname.$/) {
+    warn "bad record $origrec, maybe bad \$ORIGIN?\n";
+    next;
+  }
+
   my ($name) = /([\w_.-]+)\s/;
   # append zone name to record name if missing AND not dot-terminated;
@@ -152 +173 @@
 #;imap   IN      900     CNAME   deepnet.cx.
 ##fixme:  not sure how to handle the case where someone leaves off the class.
-  if ($doimport) {
-    my ($code, $msg);
-    if ($rev eq 'n') {
-      ($code,$msg) = $dnsdb->addRec('n', $rev, $zid, \$name, \$itype, \$rdata, $ttl);
-    } else {
-      ($code,$msg) = $dnsdb->addRec('n', $rev, $zid, \$rdata, \$itype, \$name, $ttl);
-    }
-    print "$code: $msg\n";
-  }
+#  if ($doimport) {
+#    my ($code, $msg);
+#    if ($rev eq 'n') {
+#      ($code,$msg) = $dnsdb->addRec('n', $rev, $zid, \$name, \$itype, \$rdata, $ttl);
+#    } else {
+#      ($code,$msg) = $dnsdb->addRec('n', $rev, $zid, \$rdata, \$itype, \$name, $ttl);
+#    }
+#    print "$code: $msg\n";
+#  }
+
 }