Changeset 811 for trunk/cgi-bin

Timestamp:

03/08/16 13:54:14 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

"add VRF" action etc. See #54.

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (3 diffs)
• main.cgi (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -28 +28 @@
         $errstr
         &initIPDBGlobals &connectDB &finish &checkDBSanity
-        &addMaster &touchMaster
+        &addVRF &addMaster &touchMaster
         &listVRF &listSummary &listSubs &listContainers &listAllocations &listForMerge &listFree &listPool
         &getMasterList &getTypeList &getPoolSelect &findAllocateFrom
@@ -44 +44 @@
                 $errstr
                 &initIPDBGlobals &connectDB &finish &checkDBSanity
-                &addMaster &touchMaster
+                &addVRF &addMaster &touchMaster
                 &listVRF &listSummary &listSubs &listContainers &listAllocations &listForMerge &listFree &listPool
                 &getMasterList &getTypeList &getPoolSelect &findAllocateFrom
@@ -640 +640 @@
 #  $dbh->disconnect;
 } # end checkDBSanity
+
+
+## IPDB::addVRF()
+#
+sub addVRF {
+  my $dbh = shift;
+  my $newvrf = shift;
+  my %args = @_;
+
+  $args{comment} = '' if !$args{comment};
+  $args{location} = '' if !$args{location};
+
+  # Allow transactions, and raise an exception on errors so we can catch it later.
+  # Use local to make sure these get "reset" properly on exiting this block
+  local $dbh->{AutoCommit} = 0;
+  local $dbh->{RaiseError} = 1;
+
+  eval {
+    # Check if the VRF exists.  Arguably should check for "looks similar", but that gets ugly fast.
+    my $vrfex = $dbh->selectrow_array("SELECT vrf FROM vrfs WHERE vrf=?", undef, $newvrf);
+    die "VRF already exists!\n" if $vrfex;
+
+    # Nothing there yet, so we can insert the new VRF
+    $dbh->do("INSERT INTO vrfs (vrf,comment,location) VALUES (?,?,?)", undef,
+        $newvrf, $args{comment}, $args{location});
+
+    $dbh->commit;
+  };
+  if ($@) {
+    my $msg = $@;
+    eval { $dbh->rollback; };
+    return ('FAIL',$msg);
+  }
+  return ('OK',$newvrf);
+} # end addVRF()
 
 

trunk/cgi-bin/main.cgi

@@ -126 +126 @@
     $page->param(loclist => $result);
   }
+
+} elsif ($webvar{action} eq 'newvrf') {
+  if ($IPDBacl{$authuser} !~ /s/) {
+    $aclerr = 'addvrf';
+  } else {
+    my ($code,$msg) = addVRF($ip_dbh, $webvar{vrf}, comment => $webvar{comment}, location => $webvar{loc});
+
+    if ($code eq 'FAIL') {
+      syslog "err", "Could not add VRF '$webvar{vrf}' to database: '$msg'";
+      $page->param(err => $msg);
+      $page->param(vrf => $webvar{vrf});
+    } else {
+      $page->param(vrf => $msg);
+      if ($code eq 'WARN') {
+        $IPDB::errstr =~ s/\n\n/<br>\n/g;
+        $IPDB::errstr =~ s/:\n/:<br>\n/g;
+        $page->param(warn => $IPDB::errstr);
+      }
+      syslog "info", "$authuser added VRF $webvar{vrf}";
+    }
+
+  } # ACL check
 
 } elsif ($webvar{action} eq 'addmaster') {