Changeset 866 for trunk

Timestamp:

05/02/16 17:59:07 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

main.cgi:

• Don't spew warnings and break the UI when retrieval of the zone list for a netblock fails

IPDB.pm, ipdb-rpc.cgi:

• Fill out rpc_listPool stub in ipdb-rpc.cgi. The first likely consumer may not want the full UI dataset (with description and "deleteme" flag) so the core sub has been extended with an optional flag that defaults to on.

ipdb-rpc.cgi:

• Correct argument validation in rpc_deleteBlock()

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (2 diffs)
• ipdb-rpc.cgi (modified) (2 diffs)
• main.cgi (modified) (2 diffs)

trunk/cgi-bin/IPDB.pm

@@ -1216 +1216 @@
   my $dbh = shift;
   my $pool = shift;
+  my $incdesc = shift;
+  $incdesc = 1 if !defined($incdesc);  # extra flag to include description and "deleteme" flag
 
   my $sth = $dbh->prepare("SELECT ip,custid,available,description,type,id".
@@ -1226 +1228 @@
         custid => $custid,
         available => $available,
-        desc => $desc,
-        delme => $available eq 'n',
         parent => $pool,
         id => $id,
         );
+    if ($incdesc) {
+      $row{desc} = $desc;
+      $row{delme} = ($available eq 'n');
+    }
     push @poolips, \%row;
   }

trunk/cgi-bin/ipdb-rpc.cgi

@@ -199 +199 @@
 sub rpc_listAllocations {}
 sub rpc_listFree {}
-sub rpc_listPool {}
+
+
+sub rpc_listPool {
+  my %args = @_;
+
+  _commoncheck(\%args, 'y');
+
+  $args{include_desc} = 0 if !$args{include_desc};
+
+  # convert passed pool from CIDR to an ID, maybe
+  if ($args{pool} !~ /^\d+$/) {
+    die "Invalid pool argument" if $args{pool} !~ m{^\d+\.\d+\.\d+\.\d+/\d+$};
+    die "VRF is required\n" if !$args{vrf};  # VRF name may not be empty
+    ($pid) = $ip_dbh->selectrow_array("SELECT a.id FROM allocations a JOIN allocations m ON a.master_id=m.id".
+        " WHERE a.cidr = ? AND m.vrf = ?", undef, $args{pool}, $args{vrf});
+  }
+
+  return listPool($ip_dbh, $pid, $args{include_desc});
+} # rpc_listPool()
+
+
 sub rpc_getMasterList {}
 sub rpc_getTypeList {}
@@ -291 +311 @@
   _commoncheck(\%args, 'y');
 
-  _validateInput(\%args);
+  if (!$args{block}) {
+    $args{block} = $args{cidr} if $args{cidr};
+    die "Block/IP is required\n" if !$args{block};
+  }
 
   if ($args{block} =~ m{^(?:\d+\.){3}\d+(?:/32)?$}) {

trunk/cgi-bin/main.cgi

@@ -474 +474 @@
   $page->param(maydel => $IPDBacl{$authuser} =~ /d/);
 
-  my $plist = listPool($ip_dbh, $webvar{pool});
+  my $plist = listPool($ip_dbh, $webvar{pool}, 1);
   $page->param(poolips => $plist);
 } # end showPool
@@ -1111 +1111 @@
     my $revlist = getRevID($ip_dbh, user => $authuser, cidr => $blockinfo->{block},
         location => $blockinfo->{location});
-    $page->param(revlist => $revlist);
+    $page->param(revlist => $revlist) if $revlist;
 
     my $cached;