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

Timestamp:

12/23/15 15:46:13 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Complete adding the IP address field to the backup fields
Complete add/update handling for backup fields generally

File:

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

trunk/cgi-bin/main.cgi

@@ -676 +676 @@
     $page->param(bkepass => $q->escapeHTML($webvar{bkepass}));
     $page->param(bkport  => $webvar{bkport});
+    $page->param(bkip    => $webvar{bkip});
   }
 
@@ -739 +740 @@
   if ($webvar{backupfields}) {
     $insert_args{backup} = 1;
-    $insert_args{bkbrand} = $webvar{bkbrand};
-    $insert_args{bkmodel} = $webvar{bkmodel};
-    for my $bkfield (qw(type src user vpass epass port)) {
+    for my $bkfield (@IPDB::backupfields) {
       $insert_args{"bk$bkfield"} = ($webvar{"bk$bkfield"} ? $webvar{"bk$bkfield"} : '');
     }
@@ -908 +907 @@
   # Backup fields.  Minimal sanity checks.
   for my $bkfield (qw(brand model)) {
-    if ($webvar{"bk$bkfield"} && $webvar{"bk$bkfield"} !~ /^[a-zA-Z0-9\s_.-]+$/) {
+    if (!$webvar{"bk$bkfield"}) {
+      $page->param(err => "Backup $bkfield must be filled in if IP/netblock is flagged for backup");
+      return;
+    }
+    if ($webvar{"bk$bkfield"} !~ /^[a-zA-Z0-9\s_.-]+$/) {
       $page->param(err => "Invalid characters in backup $bkfield");
       return;
@@ -924 +927 @@
     if ($webvar{bkport} !~ /^\d+$/) {
       $page->param(err => "Backup port must be numeric");
+      return;
+    }
+  }
+##fixme:  code review:  should normalize $webvar{cidr} variants so we can
+# check for non-/32 allocations having the backup IP field filled in here,
+# instead of failing on the allocation or update attempt
+  if ($webvar{bkip}) {
+    $webvar{bkip} =~ s/^\s+//g;
+    $webvar{bkip} =~ s/\s+$//g;
+    if ($webvar{bkip} !~ /^[\da-fA-F:.]+$/) {
+      $page->param(err => "Backup IP must be an IP");
       return;
     }
@@ -990 +1004 @@
   if ($blockinfo->{hasbk}) {
     $page->param(hasbackup => $blockinfo->{hasbk});
-    for my $bkfield (qw(brand model src user vpass epass port)) {
+    for my $bkfield (@IPDB::backupfields) {
       $page->param("bk$bkfield" => $blockinfo->{"bk$bkfield"});
     }
@@ -1125 +1139 @@
   if ($IPDBacl{$authuser} =~ /s/) {
     $updargs{privdata} = $webvar{privdata};
-    for my $bkfield (qw(brand model type src user vpass epass port)) {
+    for my $bkfield (@IPDB::backupfields) {
       $updargs{"bk$bkfield"} = $webvar{"bk$bkfield"};
     }
-    $updargs{backupfields} = $webvar{backupfields};
+    $updargs{backup} = $webvar{backupfields};
   } else {
     # If the user doesn't have permissions to monkey with NOC-things, pass
@@ -1203 +1217 @@
     $page->param(nocling  => 1);
     $page->param(privdata => $webvar{privdata});
-    if ($binfo->{hasbk}) {
-      $page->param(hasbackup => $binfo->{hasbk});
-      for my $bkfield (qw(brand model type src user vpass epass port)) {
-        $page->param("bk$bkfield" => $binfo->{"bk$bkfield"});
+    if ($webvar{backupfields} && $webvar{backupfields} eq 'on') {
+      $page->param(hasbackup => 1);
+      for my $bkfield (qw(@IPDB::backupfields) {
+        $page->param("bk$bkfield" => $webvar{"bk$bkfield"});
       }
     }