Changeset 832

Timestamp:

03/30/22 14:48:23 (2 years ago)

Author:

Kris Deugau

Message:

/trunk

Replace the hack in r829 with a proper solution:

• Have getRecList() and getRecCount() accept most of the Postgres CIDR operators in the filter argument
• Have dns-rpc.cgi prefix the CIDR to remove with the <<= operator when calling getRecList()

This commit only applies the second part to the "delete everything"
branch of the RPC delByCIDR() sub with known failure cases.

See #77.

Location:

trunk

Files:

• DNSDB.pm (modified) (2 diffs)
• dns-rpc.cgi (modified) (1 diff)

trunk/DNSDB.pm

@@ -4461 +4461 @@
   # Filtering on host/val (mainly normal record list)
   if ($args{filter}) {
-    $sql .= " AND (r.host ~* ? OR r.val ~* ? OR r.host ~* ? OR r.val ~* ?)";
-    my $tmp = join('.',reverse(split(/\./,$args{filter})));
-    push @bindvars, ($args{filter},$args{filter});
-    push @bindvars, ($tmp, $tmp);
+    # not much use to end users, but internal callers may want more fine-grained restriction on CIDR ranges
+    # we'll only support the value-comparison operators;  bitwise/add/subtract don't make much sense in this context
+    my $ipfilt = 0;
+    if ($args{filter} =~ /^\s*(<|<=|=|>=|>|<>|<<|<<=|>>|>>=)\s*([\da-fA-F].+)\s*$/) {
+      my $filt_op = $1;
+      my $filt_val = $2;
+      # do we have an IP-ish value?
+      if ($filt_val =~ m,^(?:[\d.]+|[0-9a-f]+)(?:/\d+)?$,) {
+        # now make sure
+        my $tmp = new NetAddr::IP $filt_val;
+        if ($tmp) {
+          $sql .= " AND inetlazy(r.val) $filt_op ?";
+          push @bindvars, $filt_val;
+          $ipfilt = 1;
+        } # really looks like a valid IP/CIDR
+      } # looks IPish
+    } # has CIDR operator
+    if (!$ipfilt) {
+      # simple text matching, with a bit of mix-n-match to account for .arpa names
+      $sql .= " AND (r.host ~* ? OR r.val ~* ? OR r.host ~* ? OR r.val ~* ?)";
+      my $tmp = join('.',reverse(split(/\./,$args{filter})));
+      push @bindvars, ($args{filter},$args{filter});
+      push @bindvars, ($tmp, $tmp);
+    }
   }
 
@@ -4538 +4558 @@
   # Filtering on host/val (mainly normal record list)
   if ($args{filter}) {
-    $sql .= " AND (r.host ~* ? OR r.val ~* ? OR r.host ~* ? OR r.val ~* ?)";
-    my $tmp = join('.',reverse(split(/\./,$args{filter})));
-    push @bindvars, ($args{filter},$args{filter});
-    push @bindvars, ($tmp, $tmp);
+    # not much use to end users, but internal callers may want more fine-grained restriction on CIDR ranges
+    # we'll only support the value-comparison operators;  bitwise/add/subtract don't make much sense in this context
+    my $ipfilt = 0;
+    if ($args{filter} =~ /^\s*(<|<=|=|>=|>|<>|<<|<<=|>>|>>=)\s*([\da-fA-F].+)\s*$/) {
+      my $filt_op = $1;
+      my $filt_val = $2;
+      # do we have an IP-ish value?
+      if ($filt_val =~ m,^(?:[\d.]+|[0-9a-f]+)(?:/\d+)?$,) {
+        # now make sure
+        my $tmp = new NetAddr::IP $filt_val;
+        if ($tmp) {
+          $sql .= " AND inetlazy(r.val) $filt_op ?";
+          push @bindvars, $filt_val;
+          $ipfilt = 1;
+        } # really looks like a valid IP/CIDR
+      } # looks IPish
+    } # has CIDR operator
+    if (!$ipfilt) {
+      # simple text matching, with a bit of mix-n-match to account for .arpa names
+      $sql .= " AND (r.host ~* ? OR r.val ~* ? OR r.host ~* ? OR r.val ~* ?)";
+      my $tmp = join('.',reverse(split(/\./,$args{filter})));
+      push @bindvars, ($args{filter},$args{filter});
+      push @bindvars, ($tmp, $tmp);
+    }
   }
 

trunk/dns-rpc.cgi

@@ -1631 +1631 @@
         # Delete ALL EVARYTHING!!one11!! in $args{cidr}
 
-        # Use offset => 'all' to make sure we actually find all the records we need to remove,
-        # otherwise the record(s) that need to be deleted may be more than 75 records down the
-        # list and won't get caught.  We also do a crude filter based on the /24 of $args{cidr}
-        # to reduce the remote's cost for the operation - if the revzone is large, it'll iterate
-        # over a Very Large Number(TM) of records, just to delete a small handful.  Bad juju.
-        my $filt = $args{cidr};
-        $filt =~ s,\.\d+(?:/\d+)?$,,;
+        # Deleting a small $args{cidr} from a large reverse zone will sometimes
+        # silently fail by not finding the appropriate record(s).  Prepend a
+        # Postgres CIDR operator to assist in filtering
+        my $filt = "<<= $args{cidr}";
+
         my $reclist = $dnsdb->getRecList(rpc => 1, defrec => 'n', revrec => 'y', id => $zonelist->[0]->{rdns_id},
             filter => $filt, offset => 'all');