Changeset 372 for trunk/DNSDB.pm

Timestamp:

08/01/12 18:19:03 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint adding location/view support. See #10.

• minor location list template tweak
• extend importer to deal with locations on records, and location definitions
• extend exporter to handle locations

Also:

• minor SQL error-log cleanup (boolean types use 'y'/'n' or 'true'/'false'). See #25, sort of
• Fix handling of CNAME exports for reverse zones; the records look ugly but there's no simple way to autoconvert them to the template types on import
• Fix lurking buglet in tabledef update; we're using a 4-char field for locations to allow for legacy uses.

File:

• trunk/DNSDB.pm (modified) (6 diffs)

trunk/DNSDB.pm

@@ -4293 +4293 @@
 # of remaining data, allows up to 255 raw bytes
 
+  # Locations/views - worth including in the caching setup?
+  my $lochash = $dbh->selectall_hashref("SELECT location,iplist FROM locations", 'location');
+  foreach my $location (keys %$lochash) {
+    foreach my $ipprefix (split /,/, $lochash->{$location}{iplist}) {
+      print $datafile "%$location:$ipprefix\n";
+    }
+    print $datafile "%$location\n" if !$lochash->{$location}{iplist};
+  }
+
   # tracking hash so we don't double-export A+PTR or AAAA+PTR records.
   my %recflags;
 
   my $domsth = $dbh->prepare("SELECT domain_id,domain,status,changed FROM domains WHERE status=1");
-  my $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id ".
+  my $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location ".
         "FROM records WHERE domain_id=? AND type < 65280");     # Just exclude all types relating to rDNS
-  my $zonesth = $dbh->prepare("UPDATE domains SET changed=0 WHERE domain_id=?");
+  my $zonesth = $dbh->prepare("UPDATE domains SET changed='n' WHERE domain_id=?");
   $domsth->execute();
   while (my ($domid,$dom,$domstat,$changed) = $domsth->fetchrow_array) {
@@ -4312 +4321 @@
     if ($changed || -s "$config{exportcache}/$dom" == 0) {
       $recsth->execute($domid);
-      while (my ($host,$type,$val,$dist,$weight,$port,$ttl,$recid) = $recsth->fetchrow_array) {
+      while (my ($host,$type,$val,$dist,$weight,$port,$ttl,$recid,$loc) = $recsth->fetchrow_array) {
         next if $recflags{$recid};
-##fixme:  need to store location in the db, and retrieve it here.
-# temporarily hardcoded to empty so we can include it further down.
-        my $loc = '';
+
+        $loc = '' if !$loc;     # de-nullify - just in case
+##fixme:  handle case of record-with-location-that-doesn't-exist better.
+# note this currently fails safe (tested) - records with a location that
+# doesn't exist will not be sent to any client
+#       $loc = '' if !$lochash->{$loc};
 
 ##fixme:  record validity timestamp. tinydns supports fiddling with timestamps.
@@ -4349 +4361 @@
   my $revsth = $dbh->prepare("SELECT rdns_id,revnet,status,changed FROM revzones WHERE status=1 ".
         "ORDER BY masklen(revnet) DESC");
+
 # For reasons unknown, we can't sanely UNION these statements.  Feh.
 # Supposedly it should work though (note last 3 lines):
@@ -4361 +4374 @@
 #and LIMIT can be attached to a subexpression if it is enclosed in parentheses. Without parentheses, these
 #clauses will be taken to apply to the result of the UNION, not to its right-hand input expression.)
-
-  my $soasth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id ".
+  my $soasth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location ".
         "FROM records WHERE rdns_id=? AND type=6");
-  $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id ".
+  $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location ".
         "FROM records WHERE rdns_id=? AND not type=6 ".
         "ORDER BY masklen(CAST(val AS inet)) DESC, CAST(val AS inet)");
-  $zonesth = $dbh->prepare("UPDATE revzones SET changed=0 WHERE rdns_id=?");
+  $zonesth = $dbh->prepare("UPDATE revzones SET changed='n' WHERE rdns_id=?");
   $revsth->execute();
   while (my ($revid,$revzone,$revstat,$changed) = $revsth->fetchrow_array) {
@@ -4384 +4396 @@
       my (@zsoa) = $soasth->fetchrow_array();
       _printrec_tiny($datafile,'y',\%recflags,$revzone,
-        $zsoa[0],$zsoa[1],$zsoa[2],$zsoa[3],$zsoa[4],$zsoa[5],$zsoa[6],'','');
+        $zsoa[0],$zsoa[1],$zsoa[2],$zsoa[3],$zsoa[4],$zsoa[5],$zsoa[6],$zsoa[8],'');
 
       $recsth->execute($revid);
-      while (my ($host,$type,$val,$dist,$weight,$port,$ttl,$recid) = $recsth->fetchrow_array) {
+      while (my ($host,$type,$val,$dist,$weight,$port,$ttl,$recid,$loc) = $recsth->fetchrow_array) {
         next if $recflags{$recid};
-##fixme:  need to store location in the db, and retrieve it here.
-# temporarily hardcoded to empty so we can include it further down.
-        my $loc = '';
+
+        $loc = '' if !$loc;     # de-nullify - just in case
+##fixme:  handle case of record-with-location-that-doesn't-exist better.
+# note this currently fails safe (tested) - records with a location that
+# doesn't exist will not be sent to any client
+#       $loc = '' if !$lochash->{$loc};
 
 ##fixme:  record validity timestamp. tinydns supports fiddling with timestamps.
@@ -4587 +4602 @@
       } elsif ($typemap{$type} eq 'CNAME') {
 
-        print $datafile "C$host:$val:$ttl:$stamp:$loc\n";
+        if ($revrec eq 'n') {
+          print $datafile "C$host:$val:$ttl:$stamp:$loc\n";
+        } else {
+          my $val2 = NetAddr::IP->new($val);
+          print $datafile "C"._ZONE($val2, 'ZONE', 'r', '.').($val2->{isv6} ? '.ip6.arpa' : '.in-addr.arpa').
+                ":$host:$ttl:$stamp:$loc\n";
+        }
 
       } elsif ($typemap{$type} eq 'SRV') {