Changeset 798 for trunk

Timestamp:

12/23/15 15:46:13 (8 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

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (8 diffs)
• cgi-bin/main.cgi (modified) (7 diffs)
• templates/assign.tmpl (modified) (1 diff)
• templates/confirm.tmpl (modified) (2 diffs)
• templates/edit.tmpl (modified) (1 diff)
• templates/update.tmpl (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -67 +67 @@
 # Mapping hash for pooltype -> poolip-as-netblock conversions
 my %poolmap = (sd => 'en', cd => 'cn', dp => 'cn', mp => 'cn', wp => 'cn', ld => 'in', ad => 'in', bd => 'in');
+
+# Backup fields, since we iterate over the set regularly
+our @backupfields = qw(brand model type src user vpass epass port ip);
 
 # Friendly display strings for merge scopes
@@ -1472 +1475 @@
       my $backupid = 0;
       if ($args{backup}) {
-        my $sql = "INSERT INTO backuplist (";
+        my $bksql = "INSERT INTO backuplist (";
         my @bkvals;
-        for my $bk (qw(brand model type port src user vpass epass)) {
+        my @bkfields;
+        for my $bk (@backupfields) {
           if ($args{"bk$bk"}) {
-            $sql .= "bk$bk,";
+            push @bkfields, "bk$bk";
             push @bkvals, $args{"bk$bk"};
           }
         }
-        $sql .= "ip) VALUES (".('?,' x scalar(@bkvals))."?)";
-        $dbh->do($sql, undef, @bkvals, $args{cidr});
+        $bksql .= join(',',@bkfields).") VALUES (".join(',', map {'?'} @bkfields).")";
+        $dbh->do($bksql, undef, @bkvals);
         ($backupid) = $dbh->selectrow_array("SELECT currval('backuplist_backup_id_seq')");
       }
@@ -1523 +1527 @@
         $msg = "Unable to allocate $args{cidr} as '$disp_alloctypes{$args{type}}'";
 
+        # backup
+        my $backupid = 0;
+        if ($args{backup}) {
+          if (!$args{bkip}) {
+            # check for /32-ness.  no point in skipping /32 "netblocks", because they already single IPs
+            die "Backup data set on a netblock requires a backup IP\n" unless $args{cidr} =~ m{/32$};
+            $args{bkip} = $args{cidr};
+          }
+          my $bksql = "INSERT INTO backuplist (";
+          my @bkfields;
+          my @bkvals;
+          for my $bk (@backupfields) {
+            if ($args{"bk$bk"}) {
+              push @bkfields, "bk$bk";
+              push @bkvals, $args{"bk$bk"};
+            }
+          }
+          $bksql .= join(',',@bkfields).") VALUES (".join(',',map {'?'} @bkfields).")";
+          $dbh->do($bksql, undef, @bkvals);
+          ($backupid) = $dbh->selectrow_array("SELECT currval('backuplist_backup_id_seq')");
+        } # $args{backup}
+
         # Insert the allocations entry
         $dbh->do("INSERT INTO allocations ".
-                "(cidr,parent_id,master_id,vrf,vlan,custid,type,city,description,notes,circuitid,privdata,rdns)".
-                " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)", undef,
+                "(cidr,parent_id,master_id,vrf,vlan,custid,type,city,description,notes,circuitid,privdata,rdns,backup_id)".
+                " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)", undef,
                 ($args{cidr}, $fbparent, $fbmaster, $args{vrf}, $args{vlan}, $args{custid}, $args{type}, $args{city},
-                $args{desc}, $args{notes}, $args{circid}, $args{privdata}, $args{rdns}) );
+                $args{desc}, $args{notes}, $args{circid}, $args{privdata}, $args{rdns}, $backupid) );
         my ($bid) = $dbh->selectrow_array("SELECT currval('allocations_id_seq')");
 
@@ -1845 +1871 @@
     }
 
-    # check on the backup data first.  we may need to tweak the main update's parameters.
+    # backup
     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"};
+      # backup data considered "restricted";  caller should set this flag if user does not have 's' permission
+
+      my $backupid = $binfo->{hasbk};
+      if (!$binfo->{hasbk}) {
+        if ($args{backup}) {
+          # failure mode:  backup data on netblock with no IP set
+          if (!$args{bkip}) {
+            # check for /32-ness.  no point in skipping /32 "netblocks", because they already single IPs
+            die "Backup data set on a netblock requires a backup IP\n" unless $binfo->{block} =~ m{/32$};
+            $args{bkip} = $binfo->{block};
           }
+          # insert new backup record since we don't have one
+          my $bksql = "INSERT INTO backuplist (";
+          my @bkfields;
+          my @bkvals;
+          for my $bk (@backupfields) {
+            if ($args{"bk$bk"}) {
+              push @bkfields, "bk$bk";
+              push @bkvals, $args{"bk$bk"};
+            }
+          }
+          $bksql .= join(',',@bkfields).") VALUES (".join(',', map {'?'} @bkfields).")";
+          $dbh->do($bksql, undef, @bkvals);
+          ($backupid) = $dbh->selectrow_array("SELECT currval('backuplist_backup_id_seq')");
+          # add the backup ID to the update
+          push @vallist, $backupid;
+          $sql .= " = ?, backup_id";
         }
-        $dbh->do("UPDATE backuplist SET ".join(',', @bkfields)." WHERE backup_id = ?",
-            undef, @bkvals, $binfo->{hasbk})
-            if @bkfields;
+
+      } else { # !$binfo->{hasbk}
+
+        # allocation already has backup data
+        if ($args{backup}) {
+          if (!$args{bkip}) {
+            # check for /32-ness.  no point in skipping /32 "netblocks", because they are already single IPs
+            die "Backup data set on a netblock requires a backup IP\n" unless $binfo->{block} =~ m{/32$};
+            $args{bkip} = $binfo->{block};
+          }
+          my @bkfields;
+          my @bkvals;
+          for my $bk (@backupfields) {
+            no warnings qw( uninitialized );
+            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;
+        } 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;
+          }
         }
-      }
-    }
+      } # $binfo->{hasbk} defined
+    } # if !args{ignorebk}
 
     # append another SQL fragment
@@ -3027 +3093 @@
 ## IPDB::getBlockData()
 # Get CIDR or IP, custid, type, city, circuit ID, description, notes, modification time,
-# private/restricted data, for a CIDR block or pool IP
+# private/restricted data, and backup fields, for a CIDR block or pool IP
 # Also returns SWIP status flag for CIDR blocks or pool netblock for IPs
 # Takes the block ID or IP to look up and an optional flag to indicate a pool IP lookup
@@ -3045 +3111 @@
         privdata, vlan, rdns);
   my $bkfields = q(b.backup_id AS hasbk, b.bkbrand, b.bkmodel, b.bktype, b.bkport, b.bksrc,
-        b.bkuser, b.bkvpass, b.bkepass);
+        b.bkuser, b.bkvpass, b.bkepass, b.bkip);
 
   if ($type eq 'i') {
@@ -3051 +3117 @@
         SELECT p.id, p.ip AS block, p.city, p.vrf, p.parent_id, p.master_id, $commonfields,
                 d.zone >> p.ip AS revavail,
-                $bkfields
+                $bkfields
         FROM poolips p
         LEFT JOIN dnsavail d ON p.master_id = d.parent_alloc AND p.ip << d.zone
-        LEFT JOIN backuplist b ON p.backup_id = b.backup_id
+        LEFT JOIN backuplist b ON p.backup_id = b.backup_id
         WHERE id = ?
         ), undef, ($id) );
@@ -3062 +3128 @@
         SELECT a.id, a.cidr AS block, a.city, a.vrf, a.parent_id, a.master_id, swip, $commonfields,
                 f.cidr AS reserve, f.id as reserve_id,
-                d.zone >>= a.cidr AS revavail, d.zone << a.cidr AS revpartial
+                d.zone >>= a.cidr AS revavail, d.zone << a.cidr AS revpartial,
+                $bkfields
         FROM allocations a
         LEFT JOIN freeblocks f ON a.id=f.reserve_for
         LEFT JOIN dnsavail d ON a.master_id = d.parent_alloc AND (a.cidr <<= d.zone OR a.cidr >> d.zone)
+        LEFT JOIN backuplist b ON a.backup_id = b.backup_id
         WHERE a.id = ?
         ), undef, ($id) );

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"});
       }
     }

trunk/templates/assign.tmpl

@@ -175 +175 @@
 <tr><td>Enable password:</td><td><input name="bkepass"></td></tr>
 <tr><td>Alternate port (if required):</td><td><input name="bkport"></td></tr>
+<tr><td>IP (if device is part of a netblock assignment):</td><td><input name="bkip"></td></tr>
 </table>
 </li></ul>

trunk/templates/confirm.tmpl

@@ -129 +129 @@
 <tr><td>Enable password:</td><td><TMPL_VAR NAME=bkepass></td></tr>
 <tr><td>Port:</td><td><TMPL_VAR NAME=bkport></td></tr>
+<tr><td>IP:</td><td><TMPL_VAR NAME=bkip></td></tr>
 </table>
 <TMPL_ELSE>
@@ -169 +170 @@
 <input type="hidden" name="bkepass" value="<TMPL_VAR NAME=bkepass>">
 <input type="hidden" name="bkport" value="<TMPL_VAR NAME=bkport>">
+<input type="hidden" name="bkip" value="<TMPL_VAR NAME=bkip>">
 </TMPL_IF>
 </TMPL_IF>

trunk/templates/edit.tmpl

@@ -235 +235 @@
 <tr><td>Enable password:</td><td><input name="bkepass" value="<TMPL_VAR NAME=bkepass>"></td></tr>
 <tr><td>Alternate port (if required):</td><td><input name="bkport" value="<TMPL_VAR NAME=bkport>"></td></tr>
+<tr><td>IP (if device is part of a netblock assignment):</td><td><input name="bkip" value="<TMPL_VAR NAME=bkip>"></td></tr>
 </table>
 

trunk/templates/update.tmpl

@@ -80 +80 @@
 <tr><td>Enable password:</td><td><TMPL_VAR NAME=bkepass></td></tr>
 <tr><td>Port:</td><td><TMPL_VAR NAME=bkport></td></tr>
+<tr><td>IP:</td><td><TMPL_VAR NAME=bkip></td></tr>
 </table>
 <TMPL_ELSE>