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

Timestamp:

02/06/15 17:42:26 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Expose VRF field, and add a similar VLAN field (see #10).

File:

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

trunk/cgi-bin/main.cgi

@@ -345 +345 @@
     $page->param(cached => $cached);
 
+    my $pinfo = getBlockData($ip_dbh, $webvar{parent});
+    # seems reasonable that a new allocation would share a VRF with its parent
+    $page->param(pvrf => $pinfo->{vrf});
+
     $webvar{fbtype} = '' if !$webvar{fbtype};
     if ($webvar{fbtype} eq 'i') {
       my $ipinfo = getBlockData($ip_dbh, $webvar{block}, 'i');
-      my $pinfo = getBlockData($ip_dbh, $webvar{parent});
       $page->param(
         fbip => 1,
@@ -529 +532 @@
   $page->param(cidr => $cidr);
   $page->param(rdns => $webvar{rdns});
+  $page->param(vrf => $webvar{vrf});
+  $page->param(vlan => $webvar{vlan});
   $page->param(city => $q->escapeHTML($webvar{city}));
   $page->param(custid => $webvar{custid});
@@ -583 +588 @@
   }
 
-  my ($code,$msg) = allocateBlock($ip_dbh, cidr => $webvar{fullcidr}, fbid => $webvar{fbid},
-        parent => $webvar{parent}, custid => $webvar{custid}, type => $webvar{alloctype}, city => $webvar{city}, 
-        desc => $webvar{desc}, notes => $webvar{notes}, circid => $webvar{circid},
-        privdata => $webvar{privdata}, nodeid => $webvar{node}, rdns => $webvar{rdns}, user => $authuser,
-        iprev => \%iprev);
+  # Easier to see and cosmetically fiddle the list like this
+  my %insert_args = (
+        cidr            => $webvar{fullcidr},
+        fbid            => $webvar{fbid},
+        parent          => $webvar{parent},
+        custid          => $webvar{custid},
+        type            => $webvar{alloctype},
+        city            => $webvar{city}, 
+        desc            => $webvar{desc},
+        notes           => $webvar{notes},
+        circid          => $webvar{circid},
+        privdata        => $webvar{privdata},
+        nodeid          => $webvar{node},
+        rdns            => $webvar{rdns},
+        vrf             => $webvar{vrf},
+        vlan            => $webvar{vlan},
+        user            => $authuser,
+        );
+
+  my ($code,$msg) = allocateBlock($ip_dbh, %insert_args, iprev => \%iprev);
 
   if ($code eq 'OK') {
@@ -705 +725 @@
 }
 
+  # VRF.  Not a full validity check, just a basic sanity check.
+  if ($webvar{vrf}) {
+    # Trim leading and trailing whitespace first
+    $webvar{vrf} =~ s/^\s+//;
+    $webvar{vrf} =~ s/\s+$//;
+    if ($webvar{vrf} !~ /^[\w\d_.-]{1,32}$/) {
+      $page->param(err => "VRF values may only contain alphanumerics, and may not be more than 32 characters");
+      return;
+    }
+  }
+
+  # VLAN.  Should we allow/use VLAN names, or just the numeric ID?
+  if ($webvar{vlan}) {
+    # Trim leading and trailing whitespace first
+    $webvar{vlan} =~ s/^\s+//;
+    $webvar{vlan} =~ s/\s+$//;
+    # ...  ve make it ze configurable thingy!
+    if ($IPDB::numeric_vlan) {
+      if ($webvar{vlan} !~ /^\d+$/) {
+        $page->param(err => "VLANs must be numeric");
+        return;
+      }
+    } else {
+      if ($webvar{vlan} !~ /^[\w\d_.-]+$/) {
+        $page->param(err => "VLANs must be alphanumeric");
+        return;
+      }
+    }
+  }
+
   return 'OK';
 } # end validateInput
@@ -716 +766 @@
   # snag block info from db
   my $blockinfo = getBlockData($ip_dbh, $webvar{id}, $webvar{basetype});
-  $page->param(id => $webvar{id});
+  $page->param(id       => $webvar{id});
   $page->param(basetype => $webvar{basetype});
 
@@ -726 +776 @@
   ($blockinfo->{rdns},$cached) = getBlockRDNS($ip_dbh, id => $webvar{id}, type => $blockinfo->{type}, user => $authuser);
   # visual flag that we're working IPDB-local, not off more authoritative data in dnsadmin
-  $page->param(cached => $cached);
+  $page->param(cached   => $cached);
 
   my $cidr = new NetAddr::IP $blockinfo->{block};
@@ -743 +793 @@
   }
 
-  $page->param(block    => $blockinfo->{block});
-  $page->param(rdns     => $blockinfo->{rdns});
-
-  $page->param(custid   => $blockinfo->{custid});
-  $page->param(city     => $blockinfo->{city});
-  $page->param(circid   => $blockinfo->{circuitid});
-  $page->param(desc     => $blockinfo->{description});
-  $page->param(notes    => $blockinfo->{notes});
+  # consider extending this to show time as well as date
+  my ($lastmod,undef) = split /\s+/, $blockinfo->{lastmod};
+  $page->param(lastmod  => $lastmod);
+#  $page->param(lastmod  => $blockinfo->{lastmod});
+
+  $page->param(block    => $blockinfo->{block});
+  $page->param(city     => $blockinfo->{city});
+  $page->param(custid   => $blockinfo->{custid});
 
 ##fixme The check here should be built from the database
@@ -789 +839 @@
 ## end node hack
 
-  my ($lastmod,undef) = split /\s+/, $blockinfo->{lastmod};
-  $page->param(lastmod => $lastmod);
+  $page->param(rdns     => $blockinfo->{rdns});
+  $page->param(vrf      => $blockinfo->{vrf});
+  $page->param(vlan     => $blockinfo->{vlan});
 
   # not happy with the upside-down logic, but...
   $page->param(swipable => $blockinfo->{type} !~ /.i/);
-  $page->param(swip => $blockinfo->{swip} ne 'n') if $blockinfo->{swip};
+  $page->param(swip     => $blockinfo->{swip} ne 'n') if $blockinfo->{swip};
+
+  $page->param(circid   => $blockinfo->{circuitid});
+  $page->param(desc     => $blockinfo->{description});
+  $page->param(notes    => $blockinfo->{notes});
 
   # Check to see if we can display sensitive data
-  $page->param(nocling => $IPDBacl{$authuser} =~ /s/);
+  $page->param(nocling  => $IPDBacl{$authuser} =~ /s/);
   $page->param(privdata => $blockinfo->{privdata});
 
@@ -830 +885 @@
         swip            => $webvar{swip},
         rdns            => $webvar{rdns},
+        vrf             => $webvar{vrf},
+        vlan            => $webvar{vlan},
         user            => $authuser,
         );