Changeset 834

Timestamp:

04/19/22 16:34:34 (2 years ago)

Author:

Kris Deugau

Message:

/trunk

Accumulated tinkering on compact-recs.pl, part 1

• Switch module-finding blob to latest theoretically-good form. See #80.
• Fix broken handling of "n'th natural IP" on compaction, possibly also on export
• Trim some development comments

Location:

trunk

Files:

• DNSDB.pm (modified) (2 diffs)
• compact-recs.pl (modified) (5 diffs)

trunk/DNSDB.pm

@@ -1798 +1798 @@
   my $tmpl = shift;
   my $ip = shift;
-  my $subnet = shift;   # for %ngb and %c
+  my $subnet = shift;   # %ngb, %c, and %x
   my $ipindex = shift;  # for %c
 
@@ -1842 +1842 @@
 
     if ($cn) {
-      # "natural n'th IP in the block" pattern
-      $$tmpl =~ s/$cn/$ipindex+1/e;
+      # "n'th natural IP in the block" pattern.
+      my $iptmp = new NetAddr::IP $ip;
+      my $natdex = scalar($iptmp - $$subnet);
+      $natdex++;
+      $$tmpl =~ s/$cn/$natdex/;
     }
 

trunk/compact-recs.pl

@@ -4 +4 @@
 ##
 # $Id$
-# Copyright 2013,2014,2018,2020 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright 2013-2022 Kris Deugau <kdeugau@deepnet.cx>
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -23 +23 @@
 use warnings;
 
-# push "the directory the script is in" into @INC
-use FindBin;
-use lib "$FindBin::RealBin/";
+# Taint-safe (ish) voodoo to push "the directory the script is in" into @INC.
+# See https://secure.deepnet.cx/trac/dnsadmin/ticket/80 for more gory details on how we got here.
+use File::Spec ();
+use File::Basename ();
+my $path;
+BEGIN {
+    $path = File::Basename::dirname(File::Spec->rel2abs($0));
+    if ($path =~ /(.*)/) {
+        $path = $1;
+    }
+}
+use lib $path;
 
 use DNSDB;
@@ -85 +94 @@
   $dbh->{RaiseError} = 1;
 
-  my ($zone,$ploc) = $dbh->selectrow_array("SELECT rdns_id,default_location FROM revzones WHERE revnet >>= ?",
+  my ($zonecidr,$zone,$ploc) = $dbh->selectrow_array("SELECT revnet,rdns_id,default_location FROM revzones WHERE revnet >>= ?",
         undef, ($cidr) );
   if (!$zone) {
@@ -106 +115 @@
 
   eval {
+    # First, clean up the records that match the template.
     my $getsth = $dbh->prepare("SELECT record_id,host,val FROM records ".
-        "WHERE (type = 12 OR type > 65000) AND inetlazy(val) << ?");
+        "WHERE (type = 12 OR type > 65000) AND inetlazy(val) << ? AND rdns_id = ?");
     my $delsth = $dbh->prepare("DELETE FROM records WHERE record_id = ?");
-    $getsth->execute($cidr);
+    $getsth->execute($cidr, $zone);
     my $i = 0;
     while (my ($id,$host,$val) = $getsth->fetchrow_array) {
       my $cmp = $patt;
-      DNSDB::_template4_expand(\$cmp, $val);
+      DNSDB::_template4_expand(\$cmp, $val, \$cidr);
       $delsth->execute($id) if $cmp eq $host;
       $delcnt++ if $cmp eq $host;
-#      print "got $id, '$host', '$val';  compare '$cmp'\t";
-#      print "  delete\n" if $cmp eq $host;
-#      print "  keep\n"  if $cmp ne $host;
-#      last if $i++ >8;
     }
 
@@ -129 +135 @@
         entry => "A+PTR and/or PTR records in $cidr matching $patt replaced by $typemap{$newtype} record for $cidr");
 
-#    $dbh->rollback;
     $dbh->commit;
   };