Changeset 707 for trunk/cgi-bin

Timestamp:

02/27/15 18:17:24 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Add rDNS update call for splitBlock(). Requires dnsadmin:trunk/@r680
for new RPC sub splitTemplate. See #7.
IPDB::splitBlock() required a change in argument handling to make sure
all the necessary bits got through where needed for the RPC call.

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (7 diffs)
• main.cgi (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -1462 +1462 @@
 sub splitBlock {
   my $dbh = shift;
-  my $id = shift;
-  my $basetype = shift;
-  my $newmask = shift;
+  my %args = @_;
+#  my $id = shift;
+#  my $basetype = shift;
+#  my $newmask = shift;
 
 ##fixme:  set errstr on errors so caller can suitably clue-by-four the user
-  return if $basetype ne 'b';  # only netblocks allowed!
-
-  my $binfo = getBlockData($dbh, $id);
+  return if $args{basetype} ne 'b';  # only netblocks allowed!
+
+  my $binfo = getBlockData($dbh, $args{id});
   return if !$binfo;
 
-  return if $newmask !~ /^\d+$/;
+  return if $args{newmask} !~ /^\d+$/;
 
   my @ret;
@@ -1481 +1482 @@
   # failure modes:
   # difference between $oldmask and $newmask is negative or 0
-  if ($newmask - $oldmask <= 0) {
-    $errstr = "Can't split a /$oldmask allocation into /$newmask pieces";
+  if ($args{newmask} - $oldmask <= 0) {
+    $errstr = "Can't split a /$oldmask allocation into /$args{newmask} pieces";
     return;
   }
@@ -1490 +1491 @@
   # $oldmask > n, for arbitrary n?  At least check limits of data type.
   if ($block->{isv6}) {
-    if ($newmask - $oldmask > 128) {
-      $errstr = "Impossible IPv6 mask length /$newmask requested";
+    if ($args{newmask} - $oldmask > 128) {
+      $errstr = "Impossible IPv6 mask length /$args{newmask} requested";
       return;
     }
   } else {
-    if ($newmask - $oldmask > 32) {
-      $errstr = "Impossible IPv4 mask length /$newmask requested";
+    if ($args{newmask} - $oldmask > 32) {
+      $errstr = "Impossible IPv4 mask length /$args{newmask} requested";
       return;
     }
   }
 
-  my @newblocks = $block->split($newmask);
+  my @newblocks = $block->split($args{newmask});
 
   local $dbh->{AutoCommit} = 0;
@@ -1517 +1518 @@
     }
     # note the first block in the split for return
-    push @ret, {nid => $id, nblock => "$newblocks[0]"};
+    push @ret, {nid => $args{id}, nblock => "$newblocks[0]"};
 
     # prepare
@@ -1527 +1528 @@
 
     # set up update of existing block
-    $dbh->do("UPDATE allocations SET cidr = ? WHERE id = ?", undef, ("$newblocks[0]", $id) );
+    $dbh->do("UPDATE allocations SET cidr = ? WHERE id = ?", undef, ("$newblocks[0]", $args{id}) );
 
     # axe the net, gw, and bcast IPs as necessary when splitting a "normal" pool
     if ($binfo->{type} =~ /.d/) {
       $newblocks[0]--;
-      $nbsth->execute($id, $newblocks[0]->addr);
+      $nbsth->execute($args{id}, $newblocks[0]->addr);
     }
 
@@ -1547 +1548 @@
       if ($binfo->{type} =~ /.d/) {
         # net
-        $nbsth->execute($id, $newblocks[$i]->addr);
+        $nbsth->execute($args{id}, $newblocks[$i]->addr);
         $newblocks[$i]++;
         # gw
-        $nbsth->execute($id, $newblocks[$i]->addr);
+        $nbsth->execute($args{id}, $newblocks[$i]->addr);
         $newblocks[$i]--;
         $newblocks[$i]--;
         # bcast
-        $nbsth->execute($id, $newblocks[$i]->addr);
+        $nbsth->execute($args{id}, $newblocks[$i]->addr);
         $newblocks[$i]++;
       }
       # ... and update the existing IPs with the new parent_id
-      $poolchildsth->execute($nid, $newblocks[$i], $id);
+      $poolchildsth->execute($nid, $newblocks[$i], $args{id});
     }
 
@@ -1568 +1569 @@
     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});
 
   return \@ret;

trunk/cgi-bin/main.cgi

@@ -1172 +1172 @@
     $page->param(issplit => 1);
     my $block = new NetAddr::IP $blockinfo->{block};
-    my $newblocks = splitBlock($ip_dbh, $webvar{block}, 'b', $webvar{split});
+    my $newblocks = splitBlock($ip_dbh, id => $webvar{block}, basetype => 'b', newmask => $webvar{split},
+        user => $authuser);
     if ($newblocks) {
       $page->param(newblocks => $newblocks);