Changeset 634 for trunk/cgi-bin

Timestamp:

10/09/14 12:37:39 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit 8/mumble for work done intermittently over the past ~year.
See #5, comment 25:

• Netblock update

Location:

trunk/cgi-bin

Files:

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

trunk/cgi-bin/IPDB.pm

@@ -1166 +1166 @@
   return ('FAIL', 'Missing block to update') if !$args{block};
 
+  # Spaces don't show up well in lots of places.  Make sure they don't get into the DB.
+  $args{custid} =~ s/^\s+//;
+  $args{custid} =~ s/\s+$//;
+
   # do it all in a transaction
   local $dbh->{AutoCommit} = 0;
@@ -1179 +1183 @@
   }
 
+  my $binfo;
   my $updtable = 'allocations';
-  my $keyfield = 'cidr';
+  my $keyfield = 'id';
   if ($args{type} =~ /^(.)i$/) {
     $updtable = 'poolips';
-    $keyfield = 'ip';
+    $binfo = getBlockData($dbh, $args{block}, 'i');
   } else {
 ## fixme:  there's got to be a better way...
+    $binfo = getBlockData($dbh, $args{block});
     if ($args{swip}) {
       if ($args{swip} eq 'on' || $args{swip} eq '1' || $args{swip} eq 'y') {
@@ -1203 +1209 @@
   return ('FAIL', 'No fields to update') if !@fieldlist;
 
-#  push @vallist, $args{block}, $args{rdepth}, $args{vrf};
-  push @vallist, $args{block}, $args{rdepth};
+  push @vallist, $args{block};
   my $sql = "UPDATE $updtable SET ";
   $sql .= join " = ?, ", @fieldlist;
-#  $sql .= " = ? WHERE $keyfield = ? AND rdepth = ? AND vrf = ?";
-  $sql .= " = ? WHERE $keyfield = ? AND rdepth = ? ";
+  $sql .= " = ? WHERE $keyfield = ?";
 
   eval {
@@ -1216 +1220 @@
     if ($args{node}) {
       # done with delete/insert so we don't have to worry about funkyness updating a node ref that isn't there
-      $dbh->do("DELETE FROM noderef WHERE block = ?", undef, ($args{block}) );
-      $dbh->do("INSERT INTO noderef (block,node_id) VALUES (?,?)", undef, ($args{block}, $args{node}) );
+      $dbh->do("DELETE FROM noderef WHERE block = ?", undef, ($binfo->{block}) );
+      $dbh->do("INSERT INTO noderef (block,node_id) VALUES (?,?)", undef, ($binfo->{block}, $args{node}) )
+        if $args{node} ne '--';
     }
 
@@ -1228 +1233 @@
   }
 
-  _rpc('addOrUpdateRevRec', cidr => $args{block}, name => $args{rdns}, rpcuser => $args{user});
+  $binfo->{block} =~ s|/32$||;
+  _rpc('addOrUpdateRevRec', cidr => $binfo->{block}, name => $args{rdns}, rpcuser => $args{user});
   return ('OK','OK');
 } # end updateBlock()

trunk/cgi-bin/main.cgi

@@ -651 +651 @@
 
   # snag block info from db
-  my $blockinfo = getBlockData($ip_dbh, $webvar{block}, $webvar{rdepth});
+  my $blockinfo = getBlockData($ip_dbh, $webvar{id}, $webvar{basetype});
+  $page->param(id => $webvar{id});
+  $page->param(basetype => $webvar{basetype});
 
   # Clean up extra whitespace on alloc type.  Mainly a legacy-data cleanup.
@@ -657 +659 @@
 
   # Get rDNS info;  duplicates a bit of getBlockData but also does the RPC call if possible
-  $blockinfo->{rdns} = getBlockRDNS($ip_dbh, $webvar{block}, $webvar{rdepth}, user => $authuser);
-
-  $page->param(block => $webvar{block});
+  $blockinfo->{rdns} = getBlockRDNS($ip_dbh, id => $webvar{id}, type => $blockinfo->{type}, user => $authuser);
+
+  $page->param(block    => $blockinfo->{block});
   $page->param(rdns     => $blockinfo->{rdns});
-  $page->param(rdepth   => $blockinfo->{rdepth});
 
   $page->param(custid   => $blockinfo->{custid});
@@ -689 +690 @@
 
 ## node hack
-  my ($nodeid,$nodename) = getNodeInfo($ip_dbh, $webvar{block});
-  $page->param(havenodeid => $nodeid);
-
-  if ($blockinfo->{type} eq 'fr' || $blockinfo->{type} eq 'bi') {
-    $page->param(typesupportsnodes => 1);
-    $page->param(nodename => $nodename);
+  my ($nodeid,$nodename) = getNodeInfo($ip_dbh, $blockinfo->{block});
+#  $page->param(havenodeid => $nodeid);
+  $page->param(nodename => $nodename);
 
 ##fixme:  this whole hack needs cleanup and generalization for all alloctypes
 ##fixme:  arguably a bug that presence of a nodeid implies it can be changed..
-#  but except for manual database changes, only the two types fr and bi can
-#  (currently) have a nodeid set in the first place.
-    if ($IPDBacl{$authuser} =~ /c/) {
-      my $nlist = getNodeList($ip_dbh);
+  if ($IPDBacl{$authuser} =~ /c/) {
+    my $nlist = getNodeList($ip_dbh);
+    if ($nodeid) {
       foreach (@{$nlist}) {
-        $$_{selme} = ($$_{node_id} == $nodeid);
+        $$_{selme} = ($$_{node_id} == $nodeid);
       }
-      $page->param(nodelist => $nlist);
-    }
+    }
+    $page->param(nodelist => $nlist);
   }
 ## end node hack
@@ -750 +747 @@
         type            => $webvar{alloctype},
         swip            => $webvar{swip},
-        rdepth          => $webvar{rdepth},
         rdns            => $webvar{rdns},
         user            => $authuser,
@@ -783 +779 @@
 
   # Link back to browse-routed or list-pool page on "Update complete" page.
-  my $cblock = getBlockData($ip_dbh, $webvar{block}, $webvar{rdepth});
-  if (my $pooltype = ($webvar{alloctype} =~ /^(.)i$/) ) {
-    $page->param(backpool => 1);
-    $page->param(backblock => $cblock->{pool});
-  } else {
-    $page->param(backblock => $cblock->{parent});
-  }
-  $page->param(backdepth => ($webvar{rdepth}));
+  my $binfo = getBlockData($ip_dbh, $webvar{block}, $webvar{basetype});
+  my $pblock = getBlockData($ip_dbh, $binfo->{parent_id});
+  $page->param(backid => $binfo->{parent_id});
+  $page->param(backblock => $pblock->{block});
+  $page->param(backpool => ($webvar{basetype} eq 'i'));
 
   # Do some HTML fiddling here instead of using ESCAPE=HTML in the template,
@@ -799 +792 @@
   $webvar{privdata} =~ s/\n/<br>\n/;
 
-  $page->param(cidr => $webvar{block});
+  $page->param(cidr => $binfo->{block});
   $page->param(rdns => $webvar{rdns});
   $page->param(city => $webvar{city});