Changeset 855 for trunk

Timestamp:

09/15/22 16:33:50 (2 years ago)

Author:

Kris Deugau

Message:

/trunk

BIND export, unwinding dev saves, 7 of many many

• Collection of minor calling/call-receiving refinements, mainly for consistency in handling the database handle
• Pass a list of locations preparing for better iteration of output to locations/views
• Change up preliminary SOA record output to actually print BIND format records

File:

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

trunk/DNSDB/ExportBIND.pm

@@ -27 +27 @@
 sub export {
   # expected to be a DNSDB object
-  my $self = shift;
-  my $dbh = $self->{dbh};
+  my $dnsdb = shift;
 
   # to be a hash of views/locations, containing lists of zones
@@ -34 +33 @@
 
   # allow for future exports of subgroups of records
-  my $viewlist = $self->getLocList(curgroup => 1);
-
-  my $soasth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location ".
+  my $viewlist = $dnsdb->getLocList(curgroup => 1);
+
+  my $soasth = $dnsdb->{dbh}->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location ".
         "FROM records WHERE rdns_id=? AND type=6");
-  my $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location,extract(epoch from stamp),expires,stampactive ".
+  my $recsth = $dnsdb->{dbh}->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location,extract(epoch from stamp),expires,stampactive ".
         "FROM records WHERE rdns_id=? AND NOT type=6 ".
         "ORDER BY masklen(inetlazy(val)) DESC, inetlazy(val)");
 
   # Fetch active zone list
-  my $revsth = $self->{dbh}->prepare("SELECT rdns_id,revnet,status,changed,default_location FROM revzones WHERE status=1 ".
+  my $revsth = $dnsdb->{dbh}->prepare("SELECT rdns_id,revnet,status,changed,default_location FROM revzones WHERE status=1 ".
         "ORDER BY masklen(revnet) DESC, rdns_id");
   # Unflag changed zones, so we can maybe cache the export and not redo everything every time
-  my $zonesth = $self->{dbh}->prepare("UPDATE revzones SET changed='n' WHERE rdns_id=?");
+  my $zonesth = $dnsdb->{dbh}->prepare("UPDATE revzones SET changed='n' WHERE rdns_id=?");
   $revsth->execute();
   while (my ($revid,$revzone,$revstat,$changed,$defloc) = $revsth->fetchrow_array) {
     my $tmpzone = NetAddr::IP->new($revzone);
     my $zfile = $tmpzone->network->addr."-".$tmpzone->masklen;
-#    my $cachefile = "$self->{exportcache}/$zfile";
-#    my $tmpcache = "$self->{exportcache}/tmp.$zfile.$$";
+#    my $cachefile = "$dnsdb->{exportcache}/$zfile";
+#    my $tmpcache = "$dnsdb->{exportcache}/tmp.$zfile.$$";
     my $tmpcache = "tmp.$zfile.$$";      # safety net.  don't overwrite a previous known-good file
 
@@ -68 +67 @@
       #  - the cache file does not exist
       #  - the cache file is empty
-      if (!$self->{usecache} || $self->{force_refresh} || $changed || !-e $cachefile || -z $cachefile) {
-        if ($self->{usecache}) {
+      if (!$dnsdb->{usecache} || $dnsdb->{force_refresh} || $changed || !-e $cachefile || -z $cachefile) {
+        if ($dnsdb->{usecache}) {
           open ZONECACHE, ">$tmpcache" or die "Error creating temporary file $tmpcache: $!\n";
           $zonefilehandle = *ZONECACHE;
@@ -76 +75 @@
         # fetch a list of views/locations present in the zone.  we need to publish a file for each one.
         # in the event that no locations are present (~~ $viewlist is empty), /%view collapses to nothing in the zone path
-        my (@loclist) = $self->{dbh}->selectrow_array("SELECT DISTINCT location FROM records WHERE rdns_id = ?", undef, $revid);
+        my (@loclist) = $dnsdb->{dbh}->selectrow_array("SELECT DISTINCT location FROM records WHERE rdns_id = ?", undef, $revid);
         push @loclist, $defloc unless grep /$defloc/, @loclist;
-        my $zonepath = $self->{bind_export_zone_path};
+        my $zonepath = $dnsdb->{bind_export_zone_path};
         my %zonefiles;  # to be a list of file handles.
 ##fixme:  convert logical revzone into .arpa name
@@ -94 +93 @@
         $soasth->execute($revid);
         my (@zsoa) = $soasth->fetchrow_array();
-        printrec_bind($zonefilehandle, $zsoa[7], 'y',\%recflags,$revzone,
+        printrec_bind($zonefilehandle, $zsoa[7], 'y', \@loclist, $revzone,
           $zsoa[0],$zsoa[1],$zsoa[2],$zsoa[3],$zsoa[4],$zsoa[5],$zsoa[6],$zsoa[8],'');
 
@@ -135 +134 @@
         } # while ($recsth)
 
-        if ($self->{usecache}) {
+        if ($dnsdb->{usecache}) {
           close ZONECACHE; # force the file to be written
           # catch obvious write errors that leave an empty temp file
@@ -148 +147 @@
     };
     if ($@) {
-      die "error writing ".($self->{usecache} ? 'new data for ' : '')."$revzone: $@\n";
+      die "error writing ".($dnsdb->{usecache} ? 'new data for ' : '')."$revzone: $@\n";
       # error!  something borked, and we should be able to fall back on the old cache file
       # report the error, somehow.
@@ -157 +156 @@
     }
 
-#    if ($self->{usecache}) {
+#    if ($dnsdb->{usecache}) {
 #      # We've already made as sure as we can that a cached zone file is "good",
 #      # although possibly stale/obsolete due to errors creating a new one.
@@ -204 +203 @@
 # Print individual records in BIND format
 sub printrec_bind {
+  my $dnsdb = shift;
   my ($zonefiles, $recid, $revrec, $loclist, $zone, $host, $type, $val, $distance, $weight, $port, $ttl,
-        $recloc, $stamp, $expires, $stampactive) = @_;
+        $loc, $stamp, $expires, $stampactive) = @_;
 
   # Just In Case something is lingering in the DB
-  $recloc = '' if !$loc;
+  $loc = '' if !$loc;
 
   ## And now to the records!
@@ -225 +225 @@
 # anyone who says they need sub-nibble v6 delegations, at this time, needs their head examined.
 ##fixme?:  alternate SOA serial schemes?
-      ($serial) = $self->{dbh}->selectrow_array("SELECT zserial FROM revzones WHERE revnet=?", undef, $zone);
+      ($serial) = $dnsdb->{dbh}->selectrow_array("SELECT zserial FROM revzones WHERE revnet=?", undef, $zone);
       $zone = NetAddr::IP->new($zone);
       # handle split-n-multiply SOA for off-octet (8 < mask < 16) or (16 < mask < 24) v4 zones
       if (!$zone->{isv6} && ($zone->masklen < 24) && ($zone->masklen % 8 != 0)) {
         foreach my $szone ($zone->split($zone->masklen + (8 - $zone->masklen % 8))) {
-          $szone = _ZONE($szone, 'ZONE.in-addr.arpa', 'r', '.');
-          print $datafile "Z$szone:$primary:$email:$serial:$refresh:$retry:$expire:$min_ttl:$ttl:$stamp:$loc\n"
+          $szone = DNSDB::_ZONE($szone, 'ZONE.in-addr.arpa', 'r', '.');
+#          print $datafile "Z$szone:$primary:$email:$serial:$refresh:$retry:$expire:$min_ttl:$ttl:$stamp:$loc\n"
+print "$szone   $ttl    IN      SOA     $primary        $email  ( $serial $refresh $retry $expire $min_ttl )\n"
             or die $!;
         }
         return; # skips "default" bits just below
       }
-      $zone = _ZONE($zone, 'ZONE', 'r', '.').($zone->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
+      $zone = DNSDB::_ZONE($zone, 'ZONE', 'r', '.').($zone->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
     } else {
       # just snarfing the right SOA serial for the zone type
 ##fixme?:  alternate SOA serial schemes?
-      ($serial) = $self->{dbh}->selectrow_array("SELECT zserial FROM domains WHERE domain=?", undef, $zone);
+      ($serial) = $dnsdb->{dbh}->selectrow_array("SELECT zserial FROM domains WHERE domain=?", undef, $zone);
     } # revrec <> 'y'
     # suppress a "uninitialized value" warning.  should be impossible but...
     # abuse hours as the last digit pair of the serial for simplicity
     $serial = strftime("%Y%m%d%H", localtime()) if !$serial;
-    print $zonefiles{$recloc} "Z$zone:$primary:$email:$serial:$refresh:$retry:$expire:$min_ttl:$ttl:$stamp:$loc\n"
-      or die $!;
+#    print *{$zonefiles->{$loc}} "Z$zone:$primary:$email:$serial:$refresh:$retry:$expire:$min_ttl:$ttl:$stamp:$loc\n"
+#      or die $!;
+    print *{$zonefiles->{$loc}} "$zone  $ttl    IN      SOA     $primary        $email  ( $serial $refresh $retry $expire $min_ttl )\n"
+       or die $!;
   } # SOA