Changeset 1033 for branches/stable/DNSDB.pm

Timestamp:

02/11/26 13:13:59 (9 hours ago)

Author:

Kris Deugau

Message:

/branches/stable

Continue merging /trunk commits based on production

Location:

branches/stable

Files:

• . (modified) (1 prop)
• DNSDB.pm (modified) (27 diffs)

branches/stable/DNSDB.pm

@@ -3 +3 @@
 ##
 # $Id$
-# Copyright 2008-2017 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright 2008-2019 Kris Deugau <kdeugau@deepnet.cx>
 # 
 #    This program is free software: you can redistribute it and/or modify
@@ -294 +294 @@
 ##
 
+## DNSDB::_zonetable()
+# Takes default+rdns flags, returns appropriate zone table name
+sub _zonetable {
+  my $def = shift;
+  my $rev = shift;
+
+  return 'domains' if $rev ne 'y';
+  return 'revzones';
+} # end _zonetable()
+
 ## DNSDB::_rectable()
 # Takes default+rdns flags, returns appropriate table name
@@ -484 +494 @@
 #  } elsif ($self->{log_channel} eq 'syslog') {
 #  }
-} # end _log
+} # end _log()
+
+## DNSDB::_updateserial()
+# Update the serial number on a forward and/or reverse zone, and flag it as changed
+# Takes a logdata hash
+sub _updateserial {
+  my $self = shift;
+  my $dbh = $self->{dbh};
+
+  my %args = @_;
+
+##fixme:  add alternate serial schemes here
+
+  if ($args{rdns_id}) {
+    $dbh->do("UPDATE revzones SET changed = 'y',zserial = ? WHERE rdns_id = ?", undef, (scalar(time), $args{rdns_id}) );
+  }
+  if ($args{domain_id}) {
+    $dbh->do("UPDATE domains SET changed = 'y',zserial = ? WHERE domain_id = ?", undef, (scalar(time), $args{domain_id}) );
+  }
+} # end _updateserial()
 
 
@@ -987 +1016 @@
   push @ferr, "weight" unless ${$args{weight}} =~ /^\d+$/;
   push @ferr, "port" unless ${$args{port}} =~ /^\d+$/;
-  return ('FAIL',"Distance, port and weight are required, and must be numeric (check ".join(",", @ferr).")")
+  return ('FAIL',"Distance, port and weight are required, and must be numeric (check ".join(", ", @ferr).")")
         unless ${$args{dist}} =~ /^\d+$/ && ${$args{weight}} =~ /^\d+$/ && ${$args{port}} =~ /^\d+$/;
 
@@ -1285 +1314 @@
       # work here since we don't *know* which parent to put it in.
       # ${$args{val}} has been validated as a valid IP by now, in one of the above calls.
-      my ($revid) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet >> ?".
+      my ($revid) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet >>= ?".
         " ORDER BY masklen(revnet) DESC", undef, (${$args{val}}));
       # Fail if no match;  we can't coerce a PTR-template type down to not include the PTR bit currently.
@@ -2471 +2500 @@
   eval {
     # insert the domain...
-    $dbh->do("INSERT INTO domains (domain,group_id,status,default_location) VALUES (?,?,?,?)", undef,
-        ($domain, $group, $state, $defloc));
+    $dbh->do("INSERT INTO domains (domain,group_id,status,default_location,zserial) VALUES (?,?,?,?,?)", undef,
+        ($domain, $group, $state, $defloc, scalar(time()) ) );
 
     # get the ID...
@@ -2643 +2672 @@
 
 ## DNSDB::domainID()
-# Takes a database handle and domain name
+# Takes a domain name and default location
 # Returns the domain ID number
 sub domainID {
@@ -2673 +2702 @@
 
 ## DNSDB::revID()
-# Takes a database handle and reverse zone name
+# Takes a reverse zone name and default location
+# Assumes the reverse zone is in the logical CIDR form, not the formal .arpa form
 # Returns the rDNS ID number
 sub revID {
@@ -2751 +2781 @@
   eval {
     # insert the zone...
-    $dbh->do("INSERT INTO revzones (revnet,group_id,status,default_location) VALUES (?,?,?,?)", undef,
-        ($zone, $group, $state, $defloc) );
+    $dbh->do("INSERT INTO revzones (revnet,group_id,status,default_location,zserial) VALUES (?,?,?,?,?)", undef,
+        ($zone, $group, $state, $defloc, scalar(time()) ) );
 
     # get the ID...
@@ -4183 +4213 @@
   delete $ret->{val};
 
+  my ($ser) = $dbh->selectrow_array("SELECT zserial FROM "._zonetable($def,$rev).
+        " WHERE "._recparent($def,$rev)." = ?", undef, $id);
+  $ret->{serial} = $ser;
+
   return $ret;
 } # end getSOA()
@@ -4240 +4274 @@
         " retry $soa{retry}, expire $soa{expire}, minTTL $soa{minttl}, TTL $soa{ttl})";
     }
+    $self->_updateserial(%logdata);
     $logdata{entry} = $msg;
     $self->_log(%logdata);
@@ -4588 +4623 @@
     $dbh->do("INSERT INTO "._rectable($defrec, $revrec)." ($fields) VALUES ($vallen)",
         undef, @vallist);
+    $self->_updateserial(%logdata);
     $self->_log(%logdata);
     $dbh->commit;
@@ -4788 +4824 @@
   eval {
     $dbh->do("UPDATE "._rectable($defrec,$revrec)." SET $fields WHERE record_id=?", undef, (@vallist, $id) );
+    $self->_updateserial(%logdata);
     $self->_log(%logdata);
     $dbh->commit;
@@ -4853 +4890 @@
   eval {
     $dbh->do("UPDATE records SET $delpar = ?, type = ? WHERE record_id = ?", undef, @sqlargs);
+    # we have no %logdata in this sub
+    $self->_updateserial(domain_id => $rec->{domain_id}, rdns_id => $rec->{rdns_id});
     $self->_log(domain_id => $rec->{domain_id}, rdns_id => $rec->{rdns_id},
         group_id => $self->parentID(id => $rec->{rdns_id}, type => 'revzone', revrec => 'y'),
@@ -4903 +4942 @@
 
   eval {
-    my $sth = $dbh->do("DELETE FROM "._rectable($defrec,$revrec)." WHERE record_id=?", undef, ($id));
+    $dbh->do("DELETE FROM "._rectable($defrec,$revrec)." WHERE record_id=?", undef, ($id));
+    $self->_updateserial(%logdata);
     $self->_log(%logdata);
     $dbh->commit;
@@ -5458 +5498 @@
 ## DNSDB::getZonesByCIDR()
 # Get a list of zone names and IDs that records for a passed CIDR block are within.
-# Optionally restrict to a specific location/view
-# Optionally leave off the default_location field
+# Arguments must be passed in a hash
+# Requires an argument "cidr" for the CIDR block to find parent/child zone(s) for
+# Accepts optional arguments:
+# - return_location:  Flag indicating whether to return default_location or not
+# - location: Restrict matches to a particular location/view
+# - sort:  Valid values are ASC or DESC;  if omitted or set to something else
+#   results will be "whatever the database returns"
 sub getZonesByCIDR {
   my $self = shift;
@@ -5469 +5514 @@
         " FROM revzones WHERE (revnet >>= ? OR revnet <<= ?)".
         (defined($args{location}) ? " AND default_location = ?" : '');
+  if ($args{sort}) {
+    if ($args{sort} eq 'ASC' || $args{sort} eq 'DESC') {
+      $sql .= " ORDER BY revnet $args{sort}";
+    }
+  }
   my @svals = ($args{cidr}, $args{cidr});
   push @svals, $args{location} if defined $args{location};
@@ -5483 +5533 @@
 #  status - active/inactive state flag (defaults to active)
 #  rwsoa - overwrite-SOA flag (defaults to off)
+#  keepserial - keep the upstream serial number even if we overwrite the rest of the SOA
 #  rwns - overwrite-NS flag (defaults to off, doesn't affect subdomain NS records)
 #  merge - flag to automerge A or AAAA records with matching PTR records
@@ -5633 +5684 @@
     my $logparent;
 
+    # Snarf the zone serial.  Doing it here lets us log the serial we ultimately
+    # import with, and cleanly override or not as per the options
+    my $res = Net::DNS::Resolver->new;
+    $res->nameservers($ifrom);
+    my $soaq = $res->query($zone, "SOA");
+    die "Error retrieving SOA for $zone: ".$res->errorstring."\n" if !$soaq;
+    my $ser = ($soaq->answer)[0]->{serial};
+    if ($args{rwsoa}) {
+      if (!$args{keepserial}) {
+        $ser = scalar(time);
+      }
+    }
+
     if ($rev eq 'n') {
-##fixme:  serial
-      $dbh->do("INSERT INTO domains (domain,group_id,status) VALUES (?,?,?)", undef,
-        ($zone, $group, $args{status}) ) or die $dbh->errstr;
+      $dbh->do("INSERT INTO domains (domain,group_id,status,zserial) VALUES (?,?,?,?)", undef,
+        ($zone, $group, $args{status}, $ser) ) or die $dbh->errstr;
       # get domain id so we can do the records
       ($zone_id) = $dbh->selectrow_array("SELECT currval('domains_domain_id_seq')");
       $domain_id = $zone_id;
       $logparent = $self->_log(group_id => $group, domain_id => $domain_id,
-                entry => "[Added ".($args{status} ? 'active' : 'inactive')." domain $zone via AXFR]");
+                entry => "[Added ".($args{status} ? 'active' : 'inactive')." domain $zone with serial $ser via AXFR]");
     } else {
-##fixme:  serial
-      $dbh->do("INSERT INTO revzones (revnet,group_id,status) VALUES (?,?,?)", undef,
-        ($cidr,$group,$args{status}) );
+      $dbh->do("INSERT INTO revzones (revnet,group_id,status,zserial) VALUES (?,?,?,?)", undef,
+        ($cidr,$group,$args{status}, $ser) );
       # get revzone id so we can do the records
       ($zone_id) = $dbh->selectrow_array("SELECT currval('revzones_rdns_id_seq')");
       $rdns_id = $zone_id;
       $logparent = $self->_log(group_id => $group, rdns_id => $rdns_id,
-                entry => "[Added ".($args{status} ? 'active' : 'inactive')." reverse zone $cidr via AXFR]");
+                entry => "[Added ".($args{status} ? 'active' : 'inactive')." reverse zone $cidr with serial $ser via AXFR]");
     }
 
@@ -5658 +5720 @@
 ## caused a commit instead of barfing
 
-    my $res = Net::DNS::Resolver->new;
-    $res->nameservers($ifrom);
     $res->axfr_start($zone)
         or die "Couldn't begin AXFR\n";
@@ -6233 +6293 @@
 
       # write fresh records if:
+      #  - the zone contains ALIAS pseudorecords, which need to cascade changes from the upstream CNAME farm at every opportunity
+      if ( ($dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = ? AND type=65300", undef, $domid))[0] ) {
+        $changed = 1;  # abuse this flag for zones with ALIAS records
+        # also update the serial number, because while it shouldn't matter purely for serving
+        # records, it WILL matter if AXFR becomes part of the publishing infrastructure
+        $self->_updateserial(domain_id => $domid);
+      }
+      #  - the zone contains records which expire in less than 10 minutes or became valid less than 10 minutes ago
+      # note, no need to multi-bump the serial
+      elsif ( ($dbh->selectrow_array("SELECT COUNT(*) FROM records WHERE domain_id = ? AND ".
+              "stampactive='t' AND @(extract(epoch from stamp-now())) < 600", undef, $domid))[0] ) {
+        $changed = 1;
+        $self->_updateserial(domain_id => $domid);
+      }
       #  - we are not using the cache
       #  - force_refresh is set
@@ -6238 +6312 @@
       #  - the cache file does not exist
       #  - the cache file is empty
-      #  - the zone contains ALIAS pseudorecords, which need to cascade changes from the upstream CNAME farm at every opportunity
-      if ( ($dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = ? AND type=65300", undef, $domid))[0] ) {
-        $changed = 1;  # abuse this flag for zones with ALIAS records
-      }
       if (!$self->{usecache} || $self->{force_refresh} || $changed || !-e $cachefile || -z $cachefile) {
         if ($self->{usecache}) {
@@ -6479 +6549 @@
     # host contains pri-ns:responsible
     # val is abused to contain refresh:retry:expire:minttl
-##fixme:  "manual" serial vs tinydns-autoserial
     # let's be explicit about abusing $host and $val
     my ($email, $primary) = (split /:/, $host)[0,1];
     my ($refresh, $retry, $expire, $min_ttl) = (split /:/, $val)[0,1,2,3];
+    my $serial = 0;  # fail less horribly than leaving it empty?
     if ($revrec eq 'y') {
 ##fixme:  have to publish SOA records for each v4 /24 in sub-/16, and each /16 in sub-/8
@@ -6488 +6558 @@
 # -> only need SOA for local chunks offset from reverse delegation boundaries, so v6 is fine
 # 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);
       $zone = NetAddr::IP->new($zone);
       # handle split-n-multiply SOA for off-octet (8 < mask < 16) or (16 < mask < 24) v4 zones
@@ -6493 +6565 @@
         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"."::$refresh:$retry:$expire:$min_ttl:$ttl:$stamp:$loc\n"
+          print $datafile "Z$szone:$primary:$email:$serial:$refresh:$retry:$expire:$min_ttl:$ttl:$stamp:$loc\n"
             or die $!;
         }
@@ -6499 +6571 @@
       }
       $zone = _ZONE($zone, 'ZONE', 'r', '.').($zone->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
-    }
-    print $datafile "Z$zone:$primary:$email"."::$refresh:$retry:$expire:$min_ttl:$ttl:$stamp:$loc\n"
+    } 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);
+    } # revrec <> 'y'
+    $serial = '' if !$serial; # suppress a "uninitialized value" warning.  empty serial isn't an error, just falls back to tinydns' autoserial
+    print $datafile "Z$zone:$primary:$email:$serial:$refresh:$retry:$expire:$min_ttl:$ttl:$stamp:$loc\n"
       or die $!;
   } # SOA
@@ -6809 +6886 @@
     }
     print $datafile "$rec:$ttl:$stamp:$loc\n" or die $!;
-
   } # SSHFP