Changeset 582 for branches/stable/tiny-import.pl

Timestamp:

01/02/14 13:26:38 (10 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge forward bugfixes and option additions from /trunk r570 through r581

Location:

branches/stable

Files:

• . (modified) (1 prop)
• tiny-import.pl (modified) (9 diffs)

branches/stable/tiny-import.pl

@@ -39 +39 @@
         conv    => 0,
         trial   => 0,
-        legacy  => 0,
+        legacy  => 0,
+        merge   => 0,
+        group   => 1,
         );
+my $gnum = '';
 # Handle some command-line arguments
 while ($ARGV[0] =~ /^-/) {
   my $arg = shift @ARGV;
-  usage() if $arg !~ /^-[rclt]+$/;
+  usage() if $arg !~ /^-(?:[rclmt]+|g\d*)$/;
   # -r  rewrite imported files to comment imported records
   # -c  coerce/downconvert A+PTR = records to PTR
   # -l  swallow A+PTR as-is
+  # -m  merge PTR and A/AAAA as possible
   # -t  trial mode;  don't commit to DB or actually rewrite flatfile (disables -r)
+  # -g  import to specified group (name or ID) instead of group 1
   $arg =~ s/^-//;
-  my @tmp = split //, $arg;
-  foreach (@tmp) {
-    $importcfg{rw} = 1 if $_ eq 'r';
-    $importcfg{conv} = 1 if $_ eq 'c';
-    $importcfg{legacy} = 1 if $_ eq 'l';
-    $importcfg{trial} = 1 if $_ eq 't';
-  }
+# for Reasons (none clear), $arg is undefined yet defined, but only when number characters are involved.  Ebbeh?
+no warnings qw(uninitialized);
+  if ($arg =~ /^g/) {
+    if ($arg eq 'g') {
+      $importcfg{group} = shift @ARGV;
+    } else {
+      $arg =~ s/^g//;
+      $importcfg{group} = $arg;
+    }
+  } else {
+    my @tmp = split //, $arg;
+    foreach (@tmp) {
+      $importcfg{rw} = 1 if $_ eq 'r';
+      $importcfg{conv} = 1 if $_ eq 'c';
+      $importcfg{legacy} = 1 if $_ eq 'l';
+      $importcfg{merge} = 1 if $_ eq 'm';
+      $importcfg{trial} = 1 if $_ eq 't';
+    }
+  }
+  use warnings qw(uninitialized);
 }
 $importcfg{rw} = 0 if $importcfg{trial};
 
+# allow group names
+if ($importcfg{group} =~ /^\d+$/) {
+  $importcfg{groupname} = $dnsdb->groupName($importcfg{group});
+} else {
+  $importcfg{groupname} = $importcfg{group};
+  $importcfg{group} = $dnsdb->groupID($importcfg{groupname});
+}
+
+die usage() if $importcfg{group} !~ /^\d+$/;
+
 sub usage {
-  die q(usage:  tiny-import.pl [-r] [-c] datafile1 datafile2 ... datafileN ...
+  die q(usage:  tiny-import.pl [-rclt] [-gnn] [-g name] datafile1 datafile2 ... datafileN ...
         -r  Rewrite all specified data files with a warning header indicating the
             records are now managed by web, and commenting out all imported records.
@@ -72 +100 @@
         -l  (for "legacy")  Force import of A+PTR records as-is.  Mutually exclusive
             with -c.  -l takes precedence as -c is lossy.
+        -m  Merge PTR and A or AAAA records to A+PTR or AAAA+PTR records where possible
+        -gnnn or -g nnn or -g name
+            Import new zones into this group (group name or ID accepted) instead of
+            the root/default group 1
         -t  Trial run mode;  spits out records that would be left unimported.
             Disables -r if set.
@@ -83 +115 @@
 my $code;
 my $dbh = $dnsdb->{dbh};
+
+# collect some things for logging
+($dnsdb->{logusername}, undef, undef, undef, undef, undef, $dnsdb->{logfullname}) = getpwuid($<);
+$dnsdb->{loguserid} = 0;        # not worth setting up a pseudouser the way the RPC system does
+$dnsdb->{logusername} = $dnsdb->{logusername}."/tiny-import.pl";
+$dnsdb->{logfullname} = $dnsdb->{logusername} if !$dnsdb->{logfullname};
 
 $dbh->{AutoCommit} = 0;
@@ -129 +167 @@
   our $recsth = $dbh->prepare("INSERT INTO records (domain_id,rdns_id,host,type,val,distance,weight,port,ttl,location,stamp,expires,stampactive) ".
         " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)");
+
+  # for A/AAAA records
+  our $revcheck = $dbh->prepare("SELECT rdns_id,record_id,ttl FROM records WHERE host=? AND val=? AND type=12");
+  our $mergefwd = $dbh->prepare("UPDATE records SET type=?,domain_id=?,ttl=? WHERE record_id=?");
+  # for PTR records
+  our $fwdcheck = $dbh->prepare("SELECT domain_id,record_id,ttl FROM records WHERE host=? AND val=? AND (type=1 OR type=28)");
+  our $mergerev = $dbh->prepare("UPDATE records SET type=?,rdns_id=?,ttl=? WHERE record_id=?");
 
   my %deleg;
@@ -451 +496 @@
         ($rparent) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet >> ?", undef, ("$msg"));
       }
+
       if ($rparent) {
-        ($ttl, $stampactive, $expires, $stamp) = calcstamp($stamp, $ttl, $rparent, 'y');
-        $recsth->execute(0, $rparent, $host, 12, $msg->addr, 0, 0, 0, $ttl, $loc, $stamp, $expires, $stampactive);
+##fixme:  really want to pull this DB call inside an if $importcfg{merge},
+# but then we need to duplicate the insert for the case where the matching
+# reverse doesn't exist.
+        $host =~ s/\.$//g;   # pure sytactic sugar, we don't store this trailing dot.
+        $fwdcheck->execute($host, $msg->addr);
+        my ($domid, $recid, $rttl) = $fwdcheck->fetchrow_array;
+        if ($importcfg{merge} && $domid) {
+          $ttl = ($rttl < $ttl ? $rttl : $ttl);        # Take the shorter TTL
+          $mergerev->execute(($msg->{isv6} ? 65281 : 65280), $rparent, $ttl, $recid);
+          $dnsdb->_log(rdns_id => $rparent, domain_id => $domid, group_id => $importcfg{group},
+            entry => "[ import ] PTR ".$msg->addr." -> $host merged with matching ".
+                  ($msg->{isv6} ? 'AAAA' : 'A')." record");
+        } else {
+          ($ttl, $stampactive, $expires, $stamp) = calcstamp($stamp, $ttl, $rparent, 'y');
+          $recsth->execute(0, $rparent, $host, 12, $msg->addr, 0, 0, 0, $ttl, $loc, $stamp, $expires, $stampactive);
+        }
       } else {
         push @deferred, $rec unless $nodefer;
@@ -476 +536 @@
       my $domid = $dnsdb->_hostparent($host);
       if ($domid) {
-        ($ttl, $stampactive, $expires, $stamp) = calcstamp($stamp, $ttl, $domid, 'n');
-        $recsth->execute($domid, 0, $host, 1, $ip, 0, 0, 0, $ttl, $loc, $stamp, $expires, $stampactive);
+##fixme:  really want to pull this DB call inside an if $importcfg{merge},
+# but then we need to duplicate the insert for the case where the matching
+# reverse doesn't exist.
+        $revcheck->execute($host, $ip);
+        my ($revid, $recid, $rttl) = $revcheck->fetchrow_array;
+        if ($importcfg{merge} && $revid) {
+          $ttl = ($rttl < $ttl ? $rttl : $ttl); # Take the shorter TTL
+          $mergefwd->execute(65280, $domid, $ttl, $recid);
+          $dnsdb->_log(rdns_id => $revid, domain_id => $domid, group_id => $importcfg{group},
+            entry => "[ import ] ".($msg->{isv6} ? 'AAAA' : 'A')." record $host -> $ip".
+                  " merged with matching PTR record");
+        } else {
+          ($ttl, $stampactive, $expires, $stamp) = calcstamp($stamp, $ttl, $domid, 'n');
+          $recsth->execute($domid, 0, $host, 1, $ip, 0, 0, 0, $ttl, $loc, $stamp, $expires, $stampactive);
+        }
       } else {
         push @deferred, $rec unless $nodefer;
@@ -514 +587 @@
       if ($zone =~ /\.arpa$/) {
         ($code,$msg) = DNSDB::_zone2cidr($zone);
-        $dbh->do("INSERT INTO revzones (revnet,group_id,status,default_location) VALUES (?,1,1,?)",
-                undef, ($msg, $loc));
+        $dbh->do("INSERT INTO revzones (revnet,group_id,status,default_location) VALUES (?,?,1,?)",
+                undef, ($msg, $importcfg{group}, $loc));
         my ($rdns) = $dbh->selectrow_array("SELECT currval('revzones_rdns_id_seq')");
         my $newttl;
@@ -523 +596 @@
                 $loc, $stamp, $expires, $stampactive);
       } else {
-        $dbh->do("INSERT INTO domains (domain,group_id,status,default_location) VALUES (?,1,1,?)",
-                undef, ($zone, $loc));
+        $dbh->do("INSERT INTO domains (domain,group_id,status,default_location) VALUES (?,?,1,?)",
+                undef, ($zone, $importcfg{group}, $loc));
         my ($domid) = $dbh->selectrow_array("SELECT currval('domains_domain_id_seq')");
         my $newttl;
@@ -748 +821 @@
         my $fparent = $dnsdb->_hostparent($fqdn);
 
-        if ($fparent) {
-          ($ttl, $stampactive, $expires, $stamp) = calcstamp($stamp, $ttl, $fparent, 'n');
-          $recsth->execute($fparent, 0, $fqdn, 28, $val->addr, 0, 0, 0, $ttl, $loc, $stamp, $expires, $stampactive);
-        } else {
-          push @deferred, $rec unless $nodefer;
-          $impok = 0;
-        }
+##fixme:  really want to pull this DB call inside an if $importcfg{merge},
+# but then we need to duplicate the insert for the case where the matching
+# reverse doesn't exist.
+        $revcheck->execute($fqdn, $val);
+        my ($revid, $recid, $rttl) = $revcheck->fetchrow_array;
+
+        # If we have a revzone and merging is enabled, update the existing
+        # record with a reverse ID, set the type to one of the internal
+        # pseudotypes, and set the TTL to the lower of the two.
+        if ($importcfg{merge} && $revid) {
+          $ttl = ($rttl < $ttl ? $rttl : $ttl); # Take the shorter TTL
+          $mergefwd->execute(65281, $fparent, $ttl, $recid);
+          $dnsdb->_log(rdns_id => $revid, domain_id => $fparent, group_id => $importcfg{group},
+            entry => "[ import ] ".($msg->{isv6} ? 'AAAA' : 'A')." record $fqdn -> $val".
+                  " merged with matching PTR record");
+        } else {
+          if ($fparent) {
+            ($ttl, $stampactive, $expires, $stamp) = calcstamp($stamp, $ttl, $fparent, 'n');
+            $recsth->execute($fparent, 0, $fqdn, 28, $val->addr, 0, 0, 0, $ttl, $loc, $stamp, $expires, $stampactive);
+          } else {
+            push @deferred, $rec unless $nodefer;
+            $impok = 0;
+          }
+        }
 
       } elsif ($type == 16) {