Changeset 717 for trunk

Timestamp:

04/15/16 12:23:03 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Rollup of refinements mainly for IPDB RPC calls

• Tweak stripping of CIDR mask length to avoid missing a record
• Extra canonicalization of IP addresses to avoid missing a record
• Pass RPC flag in all getRecList() calls except direct RPC shim, so that callers not dealing natively with actual records can just send in the IPs
• Fix a couple of corner cases where detection of existing records didn't fire when it should (causing duplicates), or fired when it shouldn't (causing missing records)
• Refine handling of record sets so that deletes happen when they should

File:

• trunk/dns-rpc.cgi (modified) (10 diffs)

trunk/dns-rpc.cgi

@@ -580 +580 @@
     my $zone = new NetAddr::IP $zonelist->[0]->{revnet};
     if ($zone->contains($cidr)) {
-      # We need to strip the CIDR mask on IPv4 /32 assignments, or we just add a new record all the time.
-      my $filt = ($cidr->{isv6} || $cidr->masklen != 32 ? "$cidr" : $cidr->addr);
-      my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y',
+      # We need to strip the CIDR mask on IPv4 /32 or v6 /128 assignments, or we just add a new record all the time.
+      my $filt = ( $cidr->{isv6} ? ($cidr->masklen != 128 ? "$cidr" : $cidr->addr) :
+                   ($cidr->masklen != 32 ? "$cidr" : $cidr->addr) );
+      my $reclist = $dnsdb->getRecList(rpc => 1, defrec => 'n', revrec => 'y',
         id => $zonelist->[0]->{rdns_id}, filter => $filt);
 ##fixme: Figure some new magic to automerge new incoming A(AAA)+PTR requests
@@ -598 +599 @@
                 || $rec->{type} == 65282 || $rec->{type} == 65283 || $rec->{type} == 65284;
           next unless $rec->{val} eq $filt;     # make sure we really update the record we want to update.
-          my %newrec = (host => $args{name}, val => $args{cidr}, type => $args{type});
+          # canonicalize the IP values so funny IPv6 short forms don't
+          # cause non-updates by not being literally string-equal
+          $rec->{val} = new NetAddr::IP $rec->{val};
+          my $tmpcidr = new NetAddr::IP $args{cidr};
+          my %newrec = (host => $args{name}, val => $tmpcidr, type => $args{type});
           rpc_updateRec(defrec =>'n', revrec => 'y', id => $rec->{record_id},
                 parent_id => $zonelist->[0]->{rdns_id}, address => "$cidr", %args)
@@ -620 +625 @@
     # that spans multiple reverse zones (eg, /23 CIDR -> 2 /24 rzones)
     foreach my $zdata (@$zonelist) {
-      my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y',
+      my $reclist = $dnsdb->getRecList(rpc => 1, defrec => 'n', revrec => 'y',
         id => $zdata->{rdns_id}, filter => $zdata->{revnet});
       if (scalar(@$reclist) == 0) {
@@ -627 +632 @@
           address => "$args{cidr}", %args);
       } else {
+        my $updflag = 0;
         foreach my $rec (@$reclist) {
           # only the composite and/or template types;  pure PTR or nontemplate composite
           # types are nominally impossible here.
           next unless $rec->{type} == 65282 || $rec->{type} == 65283 || $rec->{type} == 65284;
+          my %newrec = (host => $args{name}, val => $zdata->{revnet}, type => $args{type});
           rpc_updateRec(defrec => 'n', revrec => 'y', id => $rec->{record_id},
-            parent_id => $zdata->{rdns_id}, %args);
+            parent_id => $zdata->{rdns_id}, %args)
+            if _checkRecMod($rec, \%newrec);    # and only do the update if there really is something to change
+          $updflag = 1;
           last; # only do one record.
         }
-      }
+        # catch the case of "oops, no zone-sized template record and need to add a new one",
+        # because the SOA and NS records will be returned from the getRecList() call above
+        unless ($updflag) {
+          my $type = ($cidr->{isv6} ? 65284 : 65283);
+          rpc_addRec(defrec => 'n', revrec => 'y', parent_id => $zdata->{rdns_id}, type => $type,
+            address => $zdata->{revnet}, %args);
+        }
+      } # scalar(@$reclist) != 0
     } # iterate zones within $cidr
   } # done $cidr-contains-zones
@@ -658 +674 @@
   # now we check the parts of the block that didn't get passed to see if they should be deleted
   my $block = new NetAddr::IP $args{cidr};
-  foreach my $ip (@{$block->splitref(32)}) {
-    my $bare = $ip->addr;
-    next if $args{"host_$bare"};
-    delByCIDR(delforward => 1, delsubs => 0, cidr => $bare, location => $args{location},
+  if (!$block->{isv6}) {
+    foreach my $ip (@{$block->splitref(32)}) {
+      my $bare = $ip->addr;
+      next if $args{"host_$bare"};
+      delByCIDR(delforward => 1, delsubs => 0, cidr => $bare, location => $args{location},
         rpcuser => $args{rpcuser}, rpcsystem => $args{rpcsystem});
+    }
   }
 
@@ -687 +705 @@
     if ($zone->contains($cidr)) {
       # Find the first record in the reverse zone that matches the CIDR we're splitting...
-      my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y',
+      my $reclist = $dnsdb->getRecList(rpc => 1, defrec => 'n', revrec => 'y',
         id => $zonelist->[0]->{rdns_id}, filter => $cidr, sortby => 'val', sortorder => 'DESC');
       my $oldrec;
@@ -896 +914 @@
   $args{delforward} = 0 if !$args{delforward};
 
+  # make sure this is set if not passed
+  $args{location} = '' if !$args{location};
+
   # much like addOrUpdateRevRec()
   my $zonelist = $dnsdb->getZonesByCIDR(%args);
@@ -909 +930 @@
       if ($args{delsubs}) {
         # Delete ALL EVARYTHING!!one11!! in $args{cidr}
-        my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y', id => $zonelist->[0]->{rdns_id});
+        my $reclist = $dnsdb->getRecList(rpc => 1, defrec => 'n', revrec => 'y', id => $zonelist->[0]->{rdns_id});
         foreach my $rec (@$reclist) {
           my $reccidr = new NetAddr::IP $rec->{val};
@@ -935 +956 @@
         # Selectively delete only exact matches on $args{cidr}
         # We need to strip the CIDR mask on IPv4 /32 assignments, or we can't find single-IP records
-        my $filt = ($cidr->{isv6} || $cidr->masklen != 32 ? "$cidr" : $cidr->addr);
-        my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y',
+        my $filt = ( $cidr->{isv6} ? ($cidr->masklen != 128 ? "$cidr" : $cidr->addr) :
+                     ($cidr->masklen != 32 ? "$cidr" : $cidr->addr) );
+        my $reclist = $dnsdb->getRecList(rpc => 1, defrec => 'n', revrec => 'y', location => $args{location},
           id => $zonelist->[0]->{rdns_id}, filter => $filt, sortby => 'val', sortorder => 'DESC');
         foreach my $rec (@$reclist) {
           my $reccidr = new NetAddr::IP $rec->{val};
           next unless $cidr == $reccidr;
-          # restrict to the right location
-          next unless ( defined($rec->{locname}) && defined($args{location}) &&
-                      $rec->{locname} eq $args{location} );
           next unless $rec->{type} == 12 || $rec->{type} == 65280 || $rec->{type} == 65281 ||
                       $rec->{type} == 65282 || $rec->{type} == 65283 ||$rec->{type} == 65284;
@@ -967 +986 @@
     # that spans multiple reverse zones (eg, /23 CIDR -> 2 /24 rzones)
     foreach my $zdata (@$zonelist) {
-      my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y', id => $zdata->{rdns_id});
+      my $reclist = $dnsdb->getRecList(rpc => 1, defrec => 'n', revrec => 'y', id => $zdata->{rdns_id});
       if (scalar(@$reclist) == 0) {
 # nothing to do?  or do we (re)add a record based on the parent?