Changeset 754 for trunk

Timestamp:

07/03/15 16:35:36 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

rDNS call management wrapup. See #41, #1.

Wrap almost all existing RPC calls in suitable barriers so we don't try
to make changes for IP blocks not in dnsadmin:

• Add new allocation (any type - note, may not handle edge case of a multizone block well or at all)
• Allocation update
• Split block
• Shrink block
• Delete allocation (arguably this could be done unconditionally)

Note an exception to skipping rDNS changes when deleting a master block.

Fix a minor logic bug in getBlockRDNS; return the cached value and leave
the cached flag set if nothing was retrieved. This seems marginally less
wrong than retrieving nothing and unsetting the flag.

File:

• trunk/cgi-bin/IPDB.pm (modified) (10 diffs)

trunk/cgi-bin/IPDB.pm

@@ -1444 +1444 @@
       return ('FAIL', $msg);
     } else {
-      _rpc('addOrUpdateRevRec', cidr => "$args{cidr}", name => $args{rdns}, rpcuser => $args{user});
+      # Snag the pool info
+      my $pinfo = getBlockData($args{parent});
+      # Only try to update rDNS when the pool is flagged as "rDNS available"
+      if ($binfo->{revavail} || $binfo->{revpartial}) {
+        _rpc('addOrUpdateRevRec', cidr => "$args{cidr}", name => $args{rdns}, rpcuser => $args{user});
+      }
       return ('OK', $args{cidr});
     }
@@ -1584 +1589 @@
     } # end fullcidr != alloc_from
 
-    # now we do the DNS dance for netblocks, if we have an RPC server to do it with and a pattern to use.
-    _rpc('addOrUpdateRevRec', cidr => "$args{cidr}", name => $args{rdns}, rpcuser => $args{user})
-      if $args{rdns};
-
-    # and the per-IP set, if there is one.
-    _rpc('updateRevSet', %{$args{iprev}}, rpcuser => $args{user});
+    # Snag the parent info
+    my $pinfo = getBlockData($fbparent);
+    # Only try to update rDNS when the pool is flagged as "rDNS available"
+    if ($binfo->{revavail} || $binfo->{revpartial}) {
+      # now we do the DNS dance for netblocks, if we have an RPC server to do it with and a pattern to use.
+      _rpc('addOrUpdateRevRec', cidr => "$args{cidr}", name => $args{rdns}, rpcuser => $args{user})
+        if $args{rdns};
+
+      # and the per-IP set, if there is one.
+      _rpc('updateRevSet', %{$args{iprev}}, rpcuser => $args{user});
+    }
 
     return ('OK', 'OK');
@@ -1791 +1801 @@
     return ('FAIL', $msg);
   }
+
+  # Do RPC rDNS call, if available.
+  # Snag the parent info
+  my $pinfo = getBlockData($args{parent});
+  # Return early if rDNS flag(s) are not set
+  return ('OK','OK') unless ($pinfo->{revavail} || $pinfo->{revpartial});
 
   # In case of any container (mainly master block), only update freeblocks so we don't stomp subs
@@ -1984 +2000 @@
     return;
   }
-##fixme:  RPC return code?
-# particularly useful in this case as there may be arbitrary combinations of pass, warn, fail
-# results from each of the update and add(s), which could get the user to prod dnsadmin to see what exploded
-  my $foo = _rpc('splitTemplate', cidr => $binfo->{block}, newmask => $args{newmask}, rpcuser => $args{user});
+
+  # Only try to update rDNS when the original block is flagged as "rDNS available"
+  _rpc('splitTemplate', cidr => $binfo->{block}, newmask => $args{newmask}, rpcuser => $args{user});
+      if ($binfo->{revavail} || $binfo->{revpartial});
 
   return \@ret;
@@ -2114 +2130 @@
     return;
   }
+
+  # Only try to update rDNS when the original block is flagged as "rDNS available"
+  _rpc('resizeTemplate', oldcidr => $binfo->{block}, newcidr => $newblock->network, rpcuser => $args{user});
+      if ($binfo->{revavail} || $binfo->{revpartial});
 
   return \@ret;
@@ -2635 +2655 @@
     # Note that we still need some additional code in the odd case
     # of a netblock-aligned contiguous group of static IPs
+    my $pinfo;
 
     eval {
       $msg = "Unable to deallocate $disp_alloctypes{$binfo->{type}} $cidr";
-      my $pinfo = getBlockData($dbh, $binfo->{parent_id}, 'b');
+      $pinfo = getBlockData($dbh, $binfo->{parent_id}, 'b');
 ##fixme: VRF and rdepth
       $dbh->do("UPDATE poolips SET custid = ?, available = 'y',".
@@ -2650 +2671 @@
       eval { $dbh->rollback; };
       return ('FAIL',$msg);
-    } else {
+    }
+
 ##fixme:  RPC return code?
-      _rpc('delByCIDR', cidr => "$cidr", user => $user, delforward => $delfwd, rpcuser => $user);
-      return ('OK',"OK");
-    }
+    _rpc('delByCIDR', cidr => "$cidr", user => $user, delforward => $delfwd, rpcuser => $user)
+        if ($pinfo->{revavail} || $pinfo->{revpartial});
+
+    return ('OK',"OK");
 
   } elsif ($binfo->{type} eq 'mm') { # end alloctype =~ /.i/
@@ -2685 +2708 @@
     my @fails;
     foreach my $subzone (@zonelist) {
+      # We don't wrap this call tighter, since there isn't an inherent allocation to check for rDNS-ability.
       if ($rpc_url && !_rpc('delZone', zone => "$subzone", revrec => 'y', rpcuser => $user, delforward => $delfwd) ) {
         push @fails, ("$subzone" => $errstr);
@@ -2878 +2902 @@
       eval { $dbh->rollback; };
       return ('FAIL', $msg);
-    } else {
+    }
+
 ##fixme:  RPC return code?
-      _rpc('delByCIDR', cidr => "$cidr", rpcuser => $user, delforward => $delfwd, delsubs => 'y', parpatt => $ppatt);
-      return ($retcode, $goback);
-    }
+    _rpc('delByCIDR', cidr => "$cidr", rpcuser => $user, delforward => $delfwd, delsubs => 'y', parpatt => $ppatt)
+        if ($binfo->{revavail} || $binfo->{revpartial});
+
+    return ($retcode, $goback);
 
   } # end alloctype != netblock
@@ -2981 +3007 @@
 
     my $remote_rdns = _rpc('getRevPattern', %rpcargs);
-    $rdns = $remote_rdns if $remote_rdns;
-    $cached = 0;
+    if ($remote_rdns) {
+      $rdns = $remote_rdns;
+      $cached = 0;
+    }
   }