Changeset 549 for branches/stable

Timestamp:

11/09/12 11:57:22 (12 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Minimal server-meltdown-prevention patch for IPv6; create the
block but don't populate IP pools. See #22, sort of.

Location:

branches/stable/cgi-bin

Files:

• IPDB.pm (modified) (5 diffs)
• main.cgi (modified) (2 diffs)

branches/stable/cgi-bin/IPDB.pm

@@ -375 +375 @@
   } else { # end IP-from-pool allocation
 
+    my $errcode = 'OK';
     if ($cidr == $alloc_from) {
       # Easiest case- insert in one table, delete in the other, and go home.  More or less.
@@ -415 +416 @@
             my ($code,$rmsg) = initPool($dbh,$cidr,$type,$city,"all");
             die $rmsg if $code eq 'FAIL';
+            $msg = $rmsg;
+            $errcode = $code;
           } elsif ($type =~ /^.d$/) {
             $msg = "Could not initialize IPs in new $disp_alloctypes{$type} $cidr";
             my ($code,$rmsg) = initPool($dbh,$cidr,$type,$city,"normal");
             die $rmsg if $code eq 'FAIL';
+            $msg = $rmsg;
+            $errcode = $code;
           }
 
@@ -436 +441 @@
         return ('FAIL',$msg);
       } else {
-        return ('OK',"OK");
+        return ($errcode,($type =~ /^.[pd]$/ ? $msg : "OK"));
       }
 
@@ -546 +551 @@
         return ('FAIL',$msg);
       } else {
-        return ('OK',"OK");
+        return ($errcode,($type =~ /^.[pd]$/ ? $msg : "OK"));
       }
 
@@ -566 +571 @@
   my ($dbh,undef,$type,$city,$class) = @_;
   my $pool = new NetAddr::IP $_[1];
+
+  return ('WARN','Refusing to melt server with IPv6 IP pool') if $pool->bits == 128;
 
 ##fixme Need to just replace 2nd char of type with i rather than capturing 1st char of type

branches/stable/cgi-bin/main.cgi

@@ -888 +888 @@
         $webvar{circid}, $webvar{privdata}, $webvar{node});
 
-  if ($code eq 'OK') {
+  if ($code eq 'OK' || $code eq 'WARN') {
     if ($webvar{alloctype} =~ /^.i$/) {
       $msg =~ s|/32||;
@@ -902 +902 @@
     } else {
       my $netblock = new NetAddr::IP $webvar{fullcidr};
-      print qq(<div class="center"><div class="heading">The block $webvar{fullcidr} was ).
-        "sucessfully added as: $disp_alloctypes{$webvar{alloctype}}</div>".
-        ( ($webvar{alloctype} eq 'pr' && $webvar{billinguser}) ?
+      if ($code eq 'OK') {
+        print qq(<div class="center"><div class="heading">The block $webvar{fullcidr} was ).
+                "sucessfully added as: $disp_alloctypes{$webvar{alloctype}}</div>";
+      } else {
+        print qq(<div class="center"><div class="heading">The block $webvar{fullcidr} was ).
+                " added as $disp_alloctypes{$webvar{alloctype}} with a warning:<br>$msg</div>";
+      }
+      print ( ($webvar{alloctype} eq 'pr' && $webvar{billinguser}) ?
                 qq(<div><a href="https://billing.example.com/radius.pl?).
                 "action=new_radius_user&custid=$webvar{custid}&userid=$webvar{billinguser}".