Changeset 782 for trunk

Timestamp:

10/08/15 17:09:51 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Add device-backup fields to pool IP assignment. See #52.

• allocateBlock() in IPDB.pm
• new assignment page

Refine CSS hiding space-gobbling fields so it can be used multiple places

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (1 diff)
• cgi-bin/main.cgi (modified) (5 diffs)
• ipdb.css (modified) (1 diff)
• templates/assign.tmpl (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -1467 +1467 @@
                 undef, ($args{parent}) );
       }
-      $dbh->do("UPDATE poolips SET custid = ?, city = ?,available='n', description = ?, notes = ?, ".
-        "circuitid = ?, privdata = ?, vrf = ?, rdns = ? ".
+
+      # backup
+      my $backupid = 0;
+      if ($args{backup}) {
+        my $sql = "INSERT INTO backuplist (";
+        my @bkvals;
+        for my $bk (qw(brand model type port src user vpass epass)) {
+          if ($args{"bk$bk"}) {
+            $sql .= "bk$bk,";
+            push @bkvals, $args{"bk$bk"};
+          }
+        }
+        $sql .= "ip) VALUES (".('?,' x scalar(@bkvals))."?)";
+        $dbh->do($sql, undef, @bkvals, $args{cidr});
+        ($backupid) = $dbh->selectrow_array("SELECT currval('backuplist_backup_id_seq')");
+      }
+
+      # finally assign the IP
+      $dbh->do("UPDATE poolips SET custid = ?, city = ?, available='n', description = ?, notes = ?, ".
+        "circuitid = ?, privdata = ?, vrf = ?, rdns = ?, backup_id = ? ".
         "WHERE ip = ? AND parent_id = ?", undef,
                 ($args{custid}, $args{city}, $args{desc}, $args{notes},
-                $args{circid}, $args{privdata}, $args{vrf}, $args{rdns},
+                $args{circid}, $args{privdata}, $args{vrf}, $args{rdns}, $backupid,
                 $args{cidr}, $args{parent}) );
 

trunk/cgi-bin/main.cgi

@@ -434 +434 @@
 ## end node hack
 
-  $page->param(privdata => $IPDBacl{$authuser} =~ /s/);
+  $page->param(nocling => $IPDBacl{$authuser} =~ /s/);
 
 } # assignBlock
@@ -657 +657 @@
 
   # Check to see if user is allowed to do anything with sensitive data
-  my $privdata = '';
-  $page->param(privdata => $q->escapeHTML($webvar{privdata},'y'))
-        if $IPDBacl{$authuser} =~ /s/;
+ if ($IPDBacl{$authuser} =~ /s/) {
+    $page->param(nocling => 1);
+    $page->param(privdata => $q->escapeHTML($webvar{privdata},'y'));
+
+    $page->param(backupfields => $webvar{backupfields});
+    $page->param(bkbrand => $webvar{bkbrand});
+    $page->param(bkmodel => $webvar{bkmodel});
+    $page->param(bktype  => $webvar{bktype});
+    $page->param(bksrc   => $webvar{bksrc});
+    $page->param(bkuser  => $webvar{bkuser});
+    # these two could use virtually any character
+    $page->param(bkvpass => $q->escapeHTML($webvar{bkvpass}));
+    $page->param(bkepass => $q->escapeHTML($webvar{bkepass}));
+    $page->param(bkport  => $webvar{bkport});
+  }
 
   # Yay!  This now has it's very own little home.
@@ -682 +694 @@
   return if !validateInput();
 
+##fixme: permission check
   if (!defined($webvar{privdata})) {
     $webvar{privdata} = '';
@@ -717 +730 @@
         );
 
+##fixme: permission check
+  # fill in backup data, if present/allowed
+  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)) {
+      $insert_args{"bk$bkfield"} = ($webvar{"bk$bkfield"} ? $webvar{"bk$bkfield"} : '');
+    }
+  }
+
   my $pinfo = getBlockData($ip_dbh, $webvar{parent});
 
@@ -874 +898 @@
         return;
       }
+    }
+  }
+
+  # Backup fields.  Minimal sanity checks.
+  for my $bkfield (qw(brand model)) {
+    if ($webvar{"bk$bkfield"} && $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;
     }
   }

trunk/ipdb.css

@@ -205 +205 @@
 }
 /* hide the checkbox */
-.collapsible li > input {
+.nocheckbox li > input {
         display: none;
         margin: 0em;

trunk/templates/assign.tmpl

@@ -150 +150 @@
 </tr>
 
-<TMPL_IF privdata>
+<TMPL_IF nocling>
 <tr>
 <td>Restricted data:</td>
 <td><textarea rows="8" cols="64" name="privdata" class="regular"></textarea></td>
+</tr>
+
+<tr>
+<td>Configuration backup:</td>
+<td>
+<ul class="collapsible notalist"><li>
+<label for="backupfields">Device/assignment requires backup?</label>
+<input type="checkbox" id="backupfields" name="backupfields" />
+<ul class="notalist"><li>
+<table><tr><td>Brand:</td><td><input name="bkbrand"></td></tr>
+<tr><td>Model:</td><td><input name="bkmodel"></td></tr>
+<tr><td colspan="2">Optional settings if different from standard ones for the device type above:</td></tr>
+<tr><td>Access method:</td><td><select name="bktype">
+<option selected="selected">telnet</option>
+<option>SSH</option>
+</select></td></tr>
+<tr><td>Connect from:</td><td><input name="bksrc"></td></tr>
+<tr><td>Username:</td><td><input name="bkuser"></td></tr>
+<tr><td>VTY password:</td><td><input name="bkvpass"></td></tr>
+<tr><td>Enable password:</td><td><input name="bkepass"></td></tr>
+<tr><td>Alternate port (if required):</td><td><input name="bkport"></td></tr>
+</table>
+</li></ul>
+</li></ul>
+</td>
 </tr>
 </TMPL_IF>