Changeset 702 for trunk/cgi-bin/main.cgi

Timestamp:

02/23/15 18:16:11 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Add "split block" feature. See #7. May still need a little tweaking
("List IPs" link for pools, refiddle rDNS template records?)

Also stubbed out "shrink block" (branch for "split block"), and added
a placeholder for "merge blocks".

File:

• trunk/cgi-bin/main.cgi (modified) (3 diffs)

trunk/cgi-bin/main.cgi

@@ -171 +171 @@
 elsif($webvar{action} eq 'update') {
   update();
+}
+elsif($webvar{action} eq 'split') {
+  prepSplit();
+}
+elsif($webvar{action} eq 'dosplit') {
+  doSplit();
 }
 elsif($webvar{action} eq 'delete') {
@@ -965 +971 @@
   $page->param(maydel => $IPDBacl{$authuser} =~ /d/);
 
+  # Need to find internal knobs to twist to actually vary these.  (Ab)use "change" flag for now
+  $page->param(maymerge => ($IPDBacl{$authuser} =~ /c/ && $blockinfo->{type} !~ /^.i$/));
+  if ($IPDBacl{$authuser} =~ /c/ && $blockinfo->{type} !~ /^.i$/) {
+    if ($blockinfo->{type} =~ /^.p$/) {
+      # PPP pools
+      $page->param(maysplit => 1) if $cidr->masklen+1 < $cidr->bits;
+    } elsif ($blockinfo->{type} =~ /.d/) {
+      # Non-PPP pools
+      $page->param(maysplit => 1) if $cidr->masklen+2 < $cidr->bits;
+    } else {
+      # Standard netblocks.  Arguably allowing splitting these down to single IPs
+      # doesn't make much sense, but forcing users to apply allocation types
+      # "properly" is worse than herding cats.
+      $page->param(maysplit => 1) if $cidr->masklen < $cidr->bits;
+    }
+  }
+
 } # edit()
 
@@ -1061 +1084 @@
 
 
+sub prepSplit {
+  if ($IPDBacl{$authuser} !~ /c/) {
+    $aclerr = 'splitblock';
+    return;
+  }
+
+  my $blockinfo = getBlockData($ip_dbh, $webvar{block});
+
+  if ($blockinfo->{type} =~ /^.i$/) {
+    $page->param(err => "Can't split a single IP allocation");
+    return;
+  }
+
+  # Info about current allocation
+  $page->param(oldblock => $blockinfo->{block});
+  $page->param(block => $webvar{block});
+
+# Note that there are probably different rules that should be followed to restrict splitting IPv6 blocks;
+# strictly speaking it will be exceptionally rare to see smaller than a /64 assigned to a customer, since that
+# breaks auto-addressing schemes.
+
+  # Generate possible splits
+  my $block = new NetAddr::IP $blockinfo->{block};
+  my $oldmask = $block->masklen;
+  if ($blockinfo->{type} =~ /^.d$/) {
+    # Non-PPP pools
+    if ($oldmask+2 >= $block->bits) {
+      $page->param(err => "Can't split a standard netblock pool any further");
+      return;
+    }
+    # Allow splitting down to v4 /30 (which results in one usable IP;  dubiously useful)
+    $page->param(sp4mask => $oldmask+2) if $oldmask+2 <= $block->bits-2;
+  } elsif ($blockinfo->{type} =~ /.p/) {
+    # Allow splitting PPP pools down to v4 /31
+    $page->param(sp4mask => $oldmask+2) if $oldmask+2 <= $block->bits-1;
+  } else {
+    # Allow splitting all other non-pool netblocks down to single IPs, which...
+    # arguably should be *aggregated* in a pool.  Except where they shouldn't.
+    $page->param(sp4mask => $oldmask+2) if $oldmask+2 <= $block->bits;
+  }
+  # set the split-in-half mask
+  $page->param(sp2mask => $oldmask+1);
+
+  # Generate possible shrink targets
+  my @keepers = $block->split($block->masklen+1);
+  $page->param(newblockA => $keepers[0]);
+  $page->param(newblockB => $keepers[1]);
+} # prepSplit()
+
+
+sub doSplit {
+  if ($IPDBacl{$authuser} !~ /c/) {
+    $aclerr = 'splitblock';
+    return;
+  }
+
+##fixme:  need consistent way to identify "this thing that is this thing" with only the ID
+# also applies to other locations
+  my $blockinfo = getBlockData($ip_dbh, $webvar{block});
+
+  if ($blockinfo->{type} =~ /^.i$/) {
+    $page->param(err => "Can't split a single IP allocation");
+    return;
+  }
+
+  if ($webvar{subact} eq 'split') {
+    $page->param(issplit => 1);
+    my $binfo = getBlockData($ip_dbh, $webvar{block});
+    $page->param(cidr => $binfo->{block});
+    my $block = new NetAddr::IP $binfo->{block};
+    my $newblocks = splitBlock($ip_dbh, $webvar{block}, 'b', $webvar{split});
+    if ($newblocks) {
+      $page->param(newblocks => $newblocks);
+      # and the backlink to the parent container
+      my $pinfo = getBlockData($ip_dbh, $binfo->{parent_id});
+      $page->param(backid => $binfo->{parent_id});
+      $page->param(backblock => $pinfo->{block});
+    } else {
+      $page->param(err => $IPDB::errstr);
+    }
+
+  } else {
+    # Shrink
+  }
+} # doSplit()
+
+
 # Delete an allocation.
 sub remove {