Changeset 829

Timestamp:

12/07/21 18:10:58 (3 years ago)

Author:

Kris Deugau

Message:

/trunk

Mostly fix an edge case deleting a CIDR range from a large revzone via RPC.
If a revzone has enough unique entries, the CIDR range to be cleared may be
more than $perpage entries down the list retrieved from a call to
getRecList() without "offset => 'all'". See #77.

File:

• trunk/dns-rpc.cgi (modified) (1 diff)

trunk/dns-rpc.cgi

@@ -1630 +1630 @@
       if ($args{delsubs}) {
         # Delete ALL EVARYTHING!!one11!! in $args{cidr}
-        my $reclist = $dnsdb->getRecList(rpc => 1, defrec => 'n', revrec => 'y', id => $zonelist->[0]->{rdns_id});
+
+        # 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+)?$,,;
+        my $reclist = $dnsdb->getRecList(rpc => 1, defrec => 'n', revrec => 'y', id => $zonelist->[0]->{rdns_id},
+            filter => $filt, offset => 'all');
+
         foreach my $rec (@$reclist) {
           my $reccidr = new NetAddr::IP $rec->{val};