Changeset 594 for branches/stable/cgi-bin/admin.cgi

Timestamp:

05/15/13 16:17:00 (12 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge SQL changes and other miscellaneous fixes from /trunk through r553.

Location:

branches/stable

Files:

• . (modified) (1 prop)
• cgi-bin/admin.cgi (modified) (10 diffs)

branches/stable/cgi-bin/admin.cgi

@@ -69 +69 @@
 }
 
+if(!defined($webvar{action})) {
+  $webvar{action} = "main";   #shuts up the warnings.
+}
+
 # handle DB error output
 if ($webvar{action} eq 'dberr') {
@@ -88 +92 @@
 my $header = HTML::Template->new(filename => "admin/header.tmpl");
 
-if(!defined($webvar{action})) {
-  $webvar{action} = "main";   #shuts up the warnings.
-}
-
 my $page;
 if (-e "$ENV{HTML_TEMPLATE_ROOT}/admin/$webvar{action}.tmpl") {
@@ -103 +103 @@
   $header->param(mainpage => 1);
 
-  $sth = $ip_dbh->prepare("select type,listname from alloctypes where listorder < 900 order by listorder");
-  $sth->execute;
-
-  my @typelist;
-  my $count = 0;
-  while (my ($type,$listname) = $sth->fetchrow_array) {
-    my %row = (
-        selected => $count++,
-        type => $type,
-        dispname => $listname
-        );
-    push @typelist, \%row;
-  }
-  $page->param(typelist => \@typelist);
-
-  my @masterlist;
-  $sth = $ip_dbh->prepare("select cidr,mtime from masterblocks order by cidr");
-  $sth->execute;
-  while (my ($cidr,$mtime) = $sth->fetchrow_array) {
-    my %row = (
-        master => $cidr,
-        masterdate => $mtime
-        );
-    push @masterlist, \%row;
-  }
-  $page->param(masterlist => \@masterlist);
-
+  my $tlist = getTypeList($ip_dbh, 'a');
+  $tlist->[0]->{sel} = 1;
+  $page->param(typelist => $tlist);
+
+  my $mlist = getMasterList($ip_dbh, 'm');
+  $page->param(masterlist => $mlist);
 }
 
@@ -136 +115 @@
 elsif ($webvar{action} eq 'alloc') {
 
-  if ($webvar{cidr} !~ /^\s*(\d{1,3}\.){3}\d{1,3}(\/\d{2})?\s*$/) {
+  my $cidr = new NetAddr::IP $webvar{cidr};
+  if (!$cidr || "$cidr" =~ /^0/) {
     $page->param(errmsg => "Can't allocate something that's not a netblock/ip");
     goto ERRJUMP;
   }
 
-  $sth = $ip_dbh->prepare("select def_custid from alloctypes where type='$webvar{alloctype}'");
-  $sth->execute;
-  my @data = $sth->fetchrow_array;
-  my $custid = $data[0];
+  my $custid = $def_custids{$webvar{alloctype}};
   if ($custid eq '') {
-    if ($webvar{custid} !~ /^(?:\d{10}|\d{7}|STAFF)(?:-\d\d?)?$/) {
-      # Force uppercase for now...
-      $webvar{custid} =~ tr/a-z/A-Z/;
-      # Crosscheck with billing.
-      my $status = CustIDCK->custid_exist($webvar{custid});
-      if ($CustIDCK::Error) {
-        $page->param(errmsg => "Error verifying customer ID: ".$CustIDCK::ErrMsg);
-        goto ERRJUMP;
-      }
-      if (!$status) {
-        $page->param(errmsg => "Customer ID not valid.  Make sure the Customer ID ".
-          "is correct.<br>\nUse STAFF for staff static IPs, and $IPDB::defcustid for any other ".
-          "non-customer assignments.");
-        goto ERRJUMP;
-      }
+    # Crosscheck with billing.
+    my $status = CustIDCK->custid_exist($webvar{custid});
+    if ($CustIDCK::Error) {
+      $page->param(errmsg => "Error verifying customer ID: ".$CustIDCK::ErrMsg);
+      goto ERRJUMP;
+    }
+    if (!$status) {
+      $page->param(errmsg => "Customer ID not valid.  Make sure the Customer ID ".
+        "is correct.<br>\nUse STAFF for staff static IPs, and $IPDB::defcustid for any other ".
+        "non-customer assignments.");
+      goto ERRJUMP;
     }
     # Type that doesn't have a default custid
@@ -166 +139 @@
   }
 
-  my $cidr = new NetAddr::IP $webvar{cidr};
-  my @data;
+  my $maskbits = $cidr->masklen;
+  my $fbtmp = findAllocateFrom($ip_dbh, $maskbits, $webvar{alloctype}, '','',
+        (gimme => "$cidr", allowpriv => 1));
+
   if ($webvar{alloctype} eq 'rm') {
-    $sth = $ip_dbh->prepare("select cidr from freeblocks where cidr >>='$cidr' and routed='n'");
-    $sth->execute;
-    @data = $sth->fetchrow_array;
-# User deserves errors if user can't be bothered to find the free block first.
-    if (!$data[0]) {
+    if (!$fbtmp) {
       $page->param(errmsg => "Can't allocate from outside a free block!!");
       goto ERRJUMP;
     }
   } elsif ($webvar{alloctype} =~ /^(.)i$/) {
-    $sth = $ip_dbh->prepare("select cidr from allocations where cidr >>='$cidr' and (type like '_d' or type like '_p')");
-    $sth->execute;
-    @data = $sth->fetchrow_array;
-# User deserves errors if user can't be bothered to find the pool and a free IP first.
-    if (!$data[0]) {
+    my $iptype = $1;
+    my $ptmp = ipParent($ip_dbh, "$cidr");
+    if ($ptmp->{type} =~ /^(.)[dp]$/) {
+      my $newiptype = "$1i";
+      $fbtmp = $ptmp->{cidr};
+      if ($ptmp->{type} !~ /^$iptype./) {
+        $page->param(warnmsg => "Warning:  Allocating IP as '".$disp_alloctypes{$newiptype}."' instead of '".
+                $disp_alloctypes{$webvar{alloctype}}."' to match pool $fbtmp\n");
+        $webvar{alloctype} = $newiptype;
+      }
+    }
+    if (!$fbtmp) {
       $page->param(errmsg => "Can't allocate static IP from outside a pool!!");
       goto ERRJUMP;
     }
   } else {
-    $sth = $ip_dbh->prepare("select cidr from freeblocks where cidr >>='$cidr' and not (routed='n')");
-    $sth->execute;
-    @data = $sth->fetchrow_array;
-# User deserves errors if user can't be bothered to find the free block first.
-    if (!$data[0]) {
+    if (!$fbtmp) {
       $page->param(errmsg => "Can't allocate from outside a routed block!!");
       goto ERRJUMP;
@@ -197 +171 @@
   }
 
-  my $alloc_from = new NetAddr::IP $data[0];
-  $sth->finish;
+  my $alloc_from = new NetAddr::IP $fbtmp;
 
   my @cities;
@@ -226 +199 @@
     $page->param(locerr => "Invalid customer location!  Go back and select customer's location.");
     goto ERRJUMP;
-  } else {
-    if ($webvar{alloctype} =~ /^.i$/) {
-      $sth = $ip_dbh->prepare("update poolips set available='n', custid='$webvar{custid}', ".
-        "city='$webvar{city}', description='$webvar{desc}', notes='$webvar{notes}' ".
-        "where ip='$webvar{cidr}'");
-      $sth->execute;
-      if ($sth->err) {
-        $page->param(errmsg => $sth->errstr);
-        syslog "err", "($authuser) Allocation of '$webvar{cidr}' to '$webvar{custid}' as ".
-                "'$webvar{alloctype}' failed: '".$sth->errstr."'";
-      } else {
-        syslog "notice", "$authuser allocated '$webvar{cidr}' to '$webvar{custid}' as ".
-                "'$webvar{alloctype}'";
-        mailNotify($ip_dbh, "a$webvar{alloctype}", "ADDED: $disp_alloctypes{$webvar{alloctype}} allocation",
-          "$disp_alloctypes{$webvar{alloctype}} $webvar{cidr} allocated to customer $webvar{custid}\n".
-          "Description: $webvar{desc}\n\nAllocated by: $authuser\n");
-      }
-    } else {
-      my ($retcode,$msg) = allocateBlock($ip_dbh, $webvar{cidr}, $webvar{alloc_from},
+  }
+
+  my ($retcode,$msg) = allocateBlock($ip_dbh, $webvar{cidr}, $webvar{alloc_from},
         $webvar{custid}, $webvar{alloctype}, $webvar{city}, $webvar{desc}, $webvar{notes},
         $webvar{circid});
-      if ($retcode eq 'OK') {
-        syslog "notice", "$authuser allocated '$webvar{cidr}' to '$webvar{custid}' as ".
-                "'$webvar{alloctype}'";
-      } else {
-        $page->param(errmsg => $msg);
-        syslog "err", "($authuser) Allocation of '$webvar{cidr}' to '$webvar{custid}' as ".
-                "'$webvar{alloctype}' failed: '$msg'";
-      }
-    } # static IP vs netblock
-
-  } # done city check
+  if ($retcode eq 'OK') {
+    syslog "notice", "$authuser allocated '$webvar{cidr}' to '$webvar{custid}' as ".
+        "'$webvar{alloctype}'";
+    if ($webvar{alloctype} =~ /^.i$/) {
+      mailNotify($ip_dbh, "a$webvar{alloctype}", "ADDED: $disp_alloctypes{$webvar{alloctype}} allocation",
+        "$disp_alloctypes{$webvar{alloctype}} $webvar{cidr} allocated to customer $webvar{custid}\n".
+        "Description: $webvar{desc}\n\nAllocated by: $authuser\n");
+    }
+  } else {
+    $page->param(errmsg => $msg);
+    syslog "err", "($authuser) Allocation of '$webvar{cidr}' to '$webvar{custid}' as ".
+        "'$webvar{alloctype}' failed: '$msg'";
+  }
 
 } elsif ($webvar{action} eq 'alloctweak') {
@@ -270 +229 @@
 } elsif ($webvar{action} eq 'touch') {
 
-  $page->param(master => $webvar{whichmaster});
-  $sth = $ip_dbh->prepare("update masterblocks set mtime=now() where cidr='$webvar{whichmaster}'");
-  $sth->execute;
-  if ($sth->err) {
-    $page->param(errmsg => $sth->errstr);
-  }
+  my ($code,$msg) = touchMaster($ip_dbh, $webvar{whichmaster});
+  $page->param(errmsg => $msg) if $code eq 'FAIL';
 
 } elsif ($webvar{action} eq 'listcust') {
@@ -612 +567 @@
 # List all IPs in a pool, and allow arbitrary admin changes to each
 # Allow changes to ALL fields
-sub showPool($) {
+sub showPool {
   my $pool = new NetAddr::IP $_[0];
 
@@ -627 +582 @@
   $page->param(typelist => \@typelist);
 
-  $sth = $ip_dbh->prepare("select ip,custid,city,type,available,description,notes from poolips where pool='$pool' order by ip");
-  $sth->execute;
+  $sth = $ip_dbh->prepare("SELECT ip,custid,city,type,available,description,notes from poolips".
+        " WHERE pool=? ORDER BY ip");
+  $sth->execute($pool);
   my @iplist;
   while (my ($ip,$custid,$city,$type,$avail,$desc,$notes) = $sth->fetchrow_array) {