Changeset 813 for trunk

Timestamp:

03/08/16 16:08:40 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Wrap validation of backup fields in an ACL check. See #52.

File:

• trunk/cgi-bin/main.cgi (modified) (1 diff)

trunk/cgi-bin/main.cgi

@@ -964 +964 @@
 
   # Backup fields.  Minimal sanity checks.
-  for my $bkfield (qw(brand model)) {
-    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;
-    }
-  }
-  for my $bkfield (qw(type src user)) {  # no spaces in these!
-    if ($webvar{"bk$bkfield"} && $webvar{"bk$bkfield"} !~ /^[a-zA-Z0-9_.-]+$/) {
-      $page->param(err => "Invalid characters in backup $bkfield");
-      return;
-    }
-  }
-  if ($webvar{bkport}) {
-    $webvar{bkport} =~ s/^\s+//g;
-    $webvar{bkport} =~ s/\s+$//g;
-    if ($webvar{bkport} !~ /^\d+$/) {
-      $page->param(err => "Backup port must be numeric");
-      return;
-    }
-  }
+  # Bypass if the user isn't authorized for backup data, or if the checkbox is unchecked
+  if ($IPDBacl{$authuser} =~ /s/ && defined($webvar{backupfields})) {
+    for my $bkfield (qw(brand model)) {
+      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;
+      }
+    }
+    for my $bkfield (qw(type src user)) {  # no spaces in these!
+      if ($webvar{"bk$bkfield"} && $webvar{"bk$bkfield"} !~ /^[a-zA-Z0-9_.-]+$/) {
+        $page->param(err => "Invalid characters in backup $bkfield");
+        return;
+      }
+    }
+    if ($webvar{bkport}) {
+      $webvar{bkport} =~ s/^\s+//g;
+      $webvar{bkport} =~ s/\s+$//g;
+      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;
-    }
-  }
+    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;
+      }
+    }
+  } # backup
 
   return 'OK';