Changeset 878

Timestamp:

01/17/23 18:22:00 (16 months ago)

Author:

Kris Deugau

Message:

/trunk

BIND export, unwinding dev saves, intermediate cleanup

Do a "does this run without execution errors?" pass over BIND export.

• Fix silly little syntax errors
• Make sure copy-paste-adjust chunks have in fact gotten the "adjust" part for the different dataset
• Remove duplicate variables and calls to fill them
• Import DNSDB so we can actually create an instance to pass through to internal subs that rely on shared variables as well as DNSDB subs that expect a DNSDB object
• Forcibly add the "common" view to the list for writing the BIND view list definition
• Consistently print (or don't) BIND view definition lines to STDOUT or the config fragment file. Might be useful to have an option to print to both?

File:

• trunk/DNSDB/ExportBIND.pm (modified) (25 diffs)

trunk/DNSDB/ExportBIND.pm

@@ -4 +4 @@
 ##
 # $Id$
-# Copyright 2022 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright 2022,2023 Kris Deugau <kdeugau@deepnet.cx>
 # 
 #    This program is free software: you can redistribute it and/or modify
@@ -25 +25 @@
 use warnings;
 
+use DNSDB;
+
 sub export {
   # expected to be a DNSDB object
@@ -86 +88 @@
 ##fixme:  need to open separate zone files for aggregated metazones eg /22 or /14
       foreach my $loc (@loclist) {
-        my $zfilepath = $dnsdb->bind_export_reverse_zone_path};
+        my $zfilepath = $dnsdb->{bind_export_reverse_zone_path};
         $zfilepath =~ s/\%view/$loc/;
         $zfilepath =~ s/\%zone/$revzone/;
@@ -111 +113 @@
 
           printf {$zonefiles{$loc}} "; %s in view %s exported %s\n", $arpazone, $loc, scalar(localtime)
-            or die "Error writing header [$zone, '$loc']: $!\n";;
+            or die "Error writing header [$cidr, '$loc']: $!\n";
 
           # need to fetch this separately since the rest of the records all (should) have real IPs in val
@@ -117 +119 @@
           my (@zsoa) = $soasth->fetchrow_array();
 ##fixme: do we even need @loclist passed in?
-          publishrec_bind(\%zonefiles, \@loclist, $zsoa[7], 'y', \%recflags, $cidr,
+          publishrec_bind($dnsdb, \%zonefiles, \@loclist, $zsoa[7], 'y', \%recflags, $cidr,
             $zsoa[0], $zsoa[1], $zsoa[2], $zsoa[3], $zsoa[4], $zsoa[5], $zsoa[6], $loc, '');
         } # if force_refresh etc
@@ -127 +129 @@
       # now the meat of the records
       $recsth->execute($revid);
-      my $fullzone = _ZONE($tmpzone, 'ZONE', 'r', '.').($tmpzone->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
 
       while (my ($host, $type, $val, $dist, $weight, $port, $ttl, $recid, $loc, $stamp, $expires, $stampactive)
@@ -136 +137 @@
         if ($val =~ /\.arpa$/) {
           # val is non-IP
-          if ($val !~ /$fullzone$/) {
-            warn "Not exporting out-of-zone record $val $typemap{$type} $host, $ttl (zone $tmpzone)\n";
+          if ($val !~ /$arpazone$/) {
+            warn "Not exporting out-of-zone record $val $typemap{$type} $host, $ttl (zone $cidr)\n";
             next;
           }
         } else {
           my $ipval = new NetAddr::IP $val;
-          if (!$tmpzone->contains($ipval)) {
-            warn "Not exporting out-of-zone record $val $typemap{$type} $host, $ttl (zone $tmpzone)\n";
+          if (!$cidr->contains($ipval)) {
+            warn "Not exporting out-of-zone record $val $typemap{$type} $host, $ttl (zone $cidr)\n";
             next;
           }
@@ -157 +158 @@
         }
 
-        publishrec_bind(\%zonefiles, \@loclist, $recid, 'y', \%recflags, $revzone,
+        publishrec_bind($dnsdb, \%zonefiles, \@loclist, $recid, 'y', \%recflags, $revzone,
                 $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp, $expires, $stampactive);
 
@@ -230 +231 @@
 #  %recflags = ();
 
-  while (my ($domid,$dom,$domstat,$changed) = $domsth->fetchrow_array) {
+  while (my ($domid,$domain,$domstat,$changed) = $domsth->fetchrow_array) {
 
     # fetch a list of views/locations present in the zone.  we need to publish a file for each one.
@@ -244 +245 @@
 
 ##fixme:  use tmpfile module for more secure temp files?  want the zone name at least in it anyway, not sure that works...
-      my $zfile = $dom;  # can probably drop this intermediate
+      my $zfile = $domain;  # can probably drop this intermediate
       my $tmpcache = "tmp.$zfile.$$";   # safety net.  don't overwrite a previous known-good file
       foreach my $loc (@loclist) {
@@ -289 +290 @@
 
           # drop in a header line so we know when things went KABOOM
-          printf {$zonefiles{$loc}} "; %s in view %s exported %s\n", $arpazone, $loc, scalar(localtime)
-                or die "Error writing header [$cidr, '$loc']: $!\n";
-
-          printrec_bind(\%zonefiles, \@loclist, $zsoa[7], 'n', \%recflags, $dom,
+          printf {$zonefiles{$loc}} "; %s in view %s exported %s\n", $domain, $loc, scalar(localtime)
+                or die "Error writing header [$domain, '$loc']: $!\n";
+
+          printrec_bind($dnsdb, \%zonefiles, \@loclist, $zsoa[7], 'n', \%recflags, $domain,
             $zsoa[0], $zsoa[1], $zsoa[2], $zsoa[3], $zsoa[4], $zsoa[5], $zsoa[6], $loc, '');
 
-#          $self->_printrec_tiny($zonefilehandle, $zsoa[7], 'n',\%recflags,$dom,
+#          $self->_printrec_tiny($zonefilehandle, $zsoa[7], 'n',\%recflags, $domain,
 #            $zsoa[0],$zsoa[1],$zsoa[2],$zsoa[3],$zsoa[4],$zsoa[5],$zsoa[6],$zsoa[8],'');
 
@@ -301 +302 @@
 
         # tag the zonefile for publication in the view
-        push @{$viewzones{$loc}}, $arpazone;
+        push @{$viewzones{$loc}}, $domain;
       } # foreach @loclist
 
@@ -320 +321 @@
 
         # Check for out-of-zone data
-        $host = $dom if $host eq '@';
-        if ($host !~ /$dom$/i) {
-          warn "Not exporting out-of-zone record $host $type $val, $ttl (zone $dom)\n";
+        $host = $domain if $host eq '@';
+        if ($host !~ /$domain$/i) {
+          warn "Not exporting out-of-zone record $host $type $val, $ttl (zone $domain)\n";
           next;
         }
@@ -328 +329 @@
         $recflags{$recid} = 1;
 
-        printrec_bind(\%zonefiles, \@loclist, $recid, 'n', \%recflags, $dom,
+        printrec_bind($dnsdb, \%zonefiles, \@loclist, $recid, 'n', \%recflags, $domain,
           $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp, $expires, $stampactive);
 
@@ -339 +340 @@
         "JOIN domains d ON r.domain_id=d.domain_id ".
         "WHERE r.type=2 AND d.domain LIKE ?");
-      $subnssth->execute('%.'.$dom);
+      $subnssth->execute('%.'.$domain);
       while (my ($host,$val,$ttl,$recid,$loc,$stamp,$expires,$stampactive) = $subnssth->fetchrow_array) {
-        printrec_bind(\%zonefiles, \@loclist, $recid, 'n', \%recflags, $dom,
+        printrec_bind($dnsdb, \%zonefiles, \@loclist, $recid, 'n', \%recflags, $domain,
           $host, 2, $val, '', '', '', $ttl, $loc, $stamp, $expires, $stampactive);
       } # subdomain-ns-recsth
@@ -355 +356 @@
 #        }
 
-      } # if $changed or cache filesize is 0
+#      } # if $changed or cache filesize is 0
 
     };
     if ($@) {
-      die "error writing ".($dnsdb->{usecache} ? 'new data for ' : '')."$revzone: $@\n";
+      die "error writing ".($dnsdb->{usecache} ? 'new data for ' : '')."$domain: $@\n";
       # error!  something borked, and we should be able to fall back on the old cache file
       # report the error, somehow.
@@ -365 +366 @@
       # mark zone as unmodified.  Only do this if no errors, that way
       # export failures should recover a little more automatically.
-      $zonesth->execute($revid);
+      $zonesth->execute($domid);
     }
 
@@ -389 +390 @@
     open BINDCONF, ">", $tmpconf;
 
-    foreach my $view (@{$viewlist}, 'common') {
+    foreach my $view (@{$viewlist}, 'common', { location => 'common', iplist => '' }) {
 #print Dumper($view);
       print BINDCONF "view $view->{location} {\n";
@@ -406 +407 @@
       foreach my $zone (@{$viewzones{$view->{location}}}) {
 ##fixme:  notify settings, maybe per-zone?
-        print qq(  zone "$zone" IN {\n\ttype master;\n\tnotify no;\n\tfile "db.$zone";\n  };\n);
+        print BINDCONF qq(  zone "$zone" IN {\n\ttype master;\n\tnotify no;\n\tfile "db.$zone";\n  };\n);
+#        print qq(  zone "$zone" IN {\n\ttype master;\n\tnotify no;\n\tfile "db.$zone";\n  };\n);
       }
       print BINDCONF "};\n\n";
@@ -431 +433 @@
   if ($loc eq '') {
     foreach my $subloc (@{$loclist}) {
-      publishrec_bind($zonefiles, $loclist, $recid, $revrec, $recflags, $zone, $host, $type, $val, $distance, $weight, $port, $ttl,
-        $subloc, $stamp, $expires, $stampactive);
+      publishrec_bind($dnsdb, $zonefiles, $loclist, $recid, $revrec, $recflags, $zone, $host, $type, $val,
+        $distance, $weight, $port, $ttl, $subloc, $stamp, $expires, $stampactive);
     }
   }
@@ -489 +491 @@
 
     } else {
-      my $recdata = "$host.     $ttl    IN      NS      $val.\n"
+      my $recdata = "$host.     $ttl    IN      NS      $val.\n";
       recprint($zonefiles, $loclist, $loc, $recdata);
     }
@@ -587 +589 @@
 #    $$recflags{$val}++;
     if ($revrec eq 'y') {
-      publishrec_bind($zonefiles, $loclist, $recid, $revrec, $recflags, $zone, $host, 12, $val, $distance, $weight, $port, $ttl,
-       $loc, $stamp, $expires, $stampactive);
+      publishrec_bind($dnsdb, $zonefiles, $loclist, $recid, $revrec, $recflags, $zone, $host, 12, $val,
+       $distance, $weight, $port, $ttl, $loc, $stamp, $expires, $stampactive);
 # ... but we need to tweak it for this case?  so the A record gets published...
 #$$recflags{$val} = 'a+ptr';
 #print {$zonefiles->{$loc}} "=$host:$val:$ttl:$stamp:$loc\n" or die $!;
-#          publishrec_bind(\%zonefiles, $recid, 'y', \@loclist, $revzone,
+#          publishrec_bind($dnsdb, \%zonefiles, $recid, 'y', \@loclist, $revzone,
 #            $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp, $expires, $stampactive);
 #  my ($zonefiles, $recid, $revrec, $loclist, $zone, $host, $type, $val, $distance, $weight, $port, $ttl,
 #        $loc, $stamp, $expires, $stampactive) = @_;
     } else {
-      publishrec_bind($zonefiles, $loclist, $recid, $revrec, $recflags, $zone, $host, 1, $val, $distance, $weight, $port, $ttl,
-        $loc, $stamp, $expires, $stampactive);
+      publishrec_bind($dnsdb, $zonefiles, $loclist, $recid, $revrec, $recflags, $zone, $host, 1, $val,
+        $distance, $weight, $port, $ttl, $loc, $stamp, $expires, $stampactive);
       # set a unique flag to skip template expansion for this IP in forward zones
       $$recflags{$val} = 'a';
@@ -612 +614 @@
     if ($val->masklen <= 16) {
       foreach my $sub ($val->split(16)) {
-        __publish_template_bind($sub, $recflags, $host, $zonefiles, $loclist, $ttl, $stamp, $loc, $zone, $revrec);
+        __publish_template_bind($dnsdb, $sub, $recflags, $host, $zonefiles, $loclist, $ttl, $stamp, $loc, $zone, $revrec);
       }
     } else {
-      __publish_template_bind($sub, $recflags, $host, $zonefiles, $loclist, $ttl, $stamp, $loc, $zone, $revrec);
+      __publish_template_bind($dnsdb, $sub, $recflags, $host, $zonefiles, $loclist, $ttl, $stamp, $loc, $zone, $revrec);
     }
   } # PTR template
@@ -626 +628 @@
     if ($val->masklen < 16) {
       foreach my $sub ($val->split(16)) {
-        __publish_template_bind($sub, $recflags, $host, $zonefiles, $loclist, $ttl, $stamp, $loc, $zone, $revrec);
+        __publish_template_bind($dnsdb, $sub, $recflags, $host, $zonefiles, $loclist, $ttl, $stamp, $loc, $zone, $revrec);
       }
     } else {
-      __publish_template_bind($sub, $recflags, $host, $zonefiles, $loclist, $ttl, $stamp, $loc, $zone, $revrec);
+      __publish_template_bind($dnsdb, $sub, $recflags, $host, $zonefiles, $loclist, $ttl, $stamp, $loc, $zone, $revrec);
     }
   } # A+PTR template
@@ -643 +645 @@
 
 sub __publish_template_bind {
+  my $dnsdb = shift;
   my $sub = shift;
   my $recflags = shift;