Changeset 788 for trunk/cgi-bin

Timestamp:

10/08/15 17:49:27 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Update IP assignment update and IP delete for backup data. See #52.

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (2 diffs)
• main.cgi (modified) (2 diffs)

trunk/cgi-bin/IPDB.pm

@@ -1841 +1841 @@
         my ($code,$rmsg) = initPool($dbh, "$newblock", $binfo->{type}, $binfo->{city}, 'normal', $args{block});
         die $rmsg if $code eq 'FAIL';
+      }
+    }
+
+    # check on the backup data first.  we may need to tweak the main update's parameters.
+    if (!defined($args{ignorebk})) {
+      if ($args{backupfields}) {
+        my @bkfields;
+        my @bkvals;
+        for my $bk (qw(brand model type src user vpass epass)) {
+          if ($binfo->{"bk$bk"} ne $args{"bk$bk"}) {
+            push @bkfields, "bk$bk = ?";
+            push @bkvals, $args{"bk$bk"};
+          }
+        }
+        $dbh->do("UPDATE backuplist SET ".join(',', @bkfields)." WHERE backup_id = ?",
+            undef, @bkvals, $binfo->{hasbk})
+            if @bkfields;
+##todo: keep historic changes for $timeperiod, by adding a backref ID field, and on updates adding a new backup
+# record instead of updating the existing one.  should probably check if new==old so we don't do needless updates
+# in that case...
+      } else {
+        if ($binfo->{hasbk}) {
+          # had backup data, no longer checked - delete backup entry
+          $dbh->do("DELETE FROM backuplist WHERE backup_id = ?", undef, $binfo->{hasbk});
+          $sql .= " = ?, backup_id";
+          push @vallist, 0;
+        }
       }
     }
@@ -2740 +2767 @@
       $msg = "Unable to deallocate $disp_alloctypes{$binfo->{type}} $cidr";
       $pinfo = getBlockData($dbh, $binfo->{parent_id}, 'b');
-##fixme: VRF and rdepth
       $dbh->do("UPDATE poolips SET custid = ?, available = 'y',".
         "city = (SELECT city FROM allocations WHERE id = ?),".
-        "description = '', notes = '', circuitid = '', vrf = ? WHERE id = ?", undef,
+        "description = '', notes = '', circuitid = '', vrf = ?, backup_id = 0".
+        " WHERE id = ?", undef,
         ($pinfo->{custid}, $binfo->{parent_id}, $pinfo->{vrf}, $id) );
+      $dbh->do("DELETE FROM backuplist WHERE backup_id = ?", undef, $binfo->{hasbk})
+          if $binfo->{hasbk};
       $dbh->commit;
     };

trunk/cgi-bin/main.cgi

@@ -1116 +1116 @@
         );
 
+  # Check to see if user is allowed to do anything with sensitive data
+  if ($IPDBacl{$authuser} =~ /s/) {
+    $updargs{privdata} = $webvar{privdata};
+    for my $bkfield (qw(brand model type src user vpass epass port)) {
+      $updargs{"bk$bkfield"} = $webvar{"bk$bkfield"};
+    }
+    $updargs{backupfields} = $webvar{backupfields};
+  } else {
+    # If the user doesn't have permissions to monkey with NOC-things, pass
+    # a flag so we don't treat it as "backup data removed"
+    $updargs{ignorebk} = 1;
+  }
+
   # Semioptional values
-  $updargs{privdata} = $webvar{privdata} if $IPDBacl{$authuser} =~ /s/;
   $updargs{node} = $webvar{node} if $webvar{node};
 
@@ -1182 +1194 @@
   $page->param(desc => $webvar{desc});
   $page->param(notes => $webvar{notes});
-  $page->param(privdata => $webvar{privdata})
-        if $IPDBacl{$authuser} =~ /s/;
+  if ($IPDBacl{$authuser} =~ /s/) {
+    $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"});
+      }
+    }
+  }
 
 } # update()