Changeset 915 for trunk

Timestamp:

04/27/18 15:28:45 (6 years ago)

Author:

Kris Deugau

Message:

/trunk

Start adding a generalized in-your-face infonotice space to attach warnings
to a netblock. See #17 and #23, sort of.

• table to hold the notices, since they're likely to be far fewer than the overall allocation count
• show any notices for the parent chain for new allocations in the admin tools

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (3 diffs)
• cgi-bin/admin.cgi (modified) (2 diffs)
• cgi-bin/ipdb-3.0-3.1.sql (added)
• cgi-bin/ipdb.psql (modified) (1 diff)
• templates/admin/alloc.tmpl (modified) (1 diff)
• templates/admin/confirm.tmpl (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -35 +35 @@
         &getBlockRDNS &getRDNSbyIP &getRevID
         &getNodeList &getNodeName &getNodeInfo
+        &getBlockNotices
         &mailNotify
         );
@@ -51 +52 @@
                 &getBlockRDNS &getRDNSbyIP &getRevID
                 &getNodeList &getNodeName &getNodeInfo
+                &getBlockNotices
                 &mailNotify
                 )]
@@ -3553 +3555 @@
 
 
+## IPDB::getBlockNotices()
+# Retrieve any infonotes for a block and all of its parents
+# Takes the block ID to trace down the stack
+# Returns an arrayref to the block and all of its parents, containing the CIDR,
+# description, and notice (if any) associated to each block.
+sub getBlockNotices {
+  my $dbh = shift;
+  my $bid = shift;
+  my $nlist = $dbh->selectall_arrayref(q(
+        WITH RECURSIVE blockparents (id, cidr, description, parent_id, notice, depth) AS (
+                SELECT a.id, a.cidr, a.description, a.parent_id, bn.notice, 1 AS depth FROM allocations a
+                LEFT JOIN blocknotices bn ON a.id = bn.alloc_id
+                WHERE a.id = ?
+                UNION
+                SELECT b.id, b.cidr, b.description, b.parent_id, bn2.notice, t.depth AS depth FROM allocations b
+                JOIN blockparents t ON t.parent_id = b.id
+                LEFT JOIN blocknotices bn2 ON b.id = bn2.alloc_id
+        ) SELECT id, cidr, description, parent_id, notice FROM blockparents ORDER BY depth DESC;
+), {Slice=>{}}, $bid);
+
+  return $nlist;
+} # end getBlockNotices()
+
+
 ## IPDB::mailNotify()
 # Sends notification mail to recipients regarding an IPDB operation

trunk/cgi-bin/admin.cgi

@@ -149 +149 @@
   ($fbid, $fb, $fbparent) = findAllocateFrom($ip_dbh, $maskbits, $webvar{alloctype}, '','',
         (gimme => "$cidr", allowpriv => 1));
+
+  # retrieve any notices
+  my $nlist = getBlockNotices($ip_dbh, $fbparent);
+  my @notices;
+  foreach (@$nlist) {
+    push @notices, $_->{notice} if $_->{notice};
+  }
+  my $blockmsg = join("<br>\n", @notices);
+  $page->param(blockmsg => $blockmsg);
+
   $page->param(fbid => $fbid);
   $page->param(parid => $fbparent);
@@ -205 +215 @@
     goto ERRJUMP;
   }
+
+  # retrieve any notices
+  my $nlist = getBlockNotices($ip_dbh, $webvar{parent});
+  my @notices;
+  foreach (@$nlist) {
+    push @notices, $_->{notice} if $_->{notice};
+  }
+  my $blockmsg = join("<br>\n", @notices);
+  $page->param(blockmsg => $blockmsg);
 
   my ($retcode,$msg) = allocateBlock($ip_dbh, cidr => $webvar{cidr}, fbid => $webvar{fbid},

trunk/cgi-bin/ipdb.psql

@@ -116 +116 @@
 ALTER TABLE ONLY freeblocks
     ADD CONSTRAINT freeblocks_pkey PRIMARY KEY (cidr, parent_id);
+
+-- Table for arbitrary infonotices tagged to an allocation
+CREATE TABLE blocknotices (
+    alloc_id integer NOT NULL,
+    ipflag boolean DEFAULT false NOT NULL,
+    notice text DEFAULT ''::text NOT NULL
+);
+
+ALTER TABLE ONLY blocknotices
+    ADD CONSTRAINT blocknotices_pkey PRIMARY KEY (alloc_id, ipflag);
 
 -- Network nodes - allows finding customers affected by a broken <x> quickly

trunk/templates/admin/alloc.tmpl

@@ +1 @@
+<TMPL_IF blockmsg><br><div class="strongwarning blockcenter w70"><TMPL_VAR NAME=blockmsg></div><br></TMPL_IF>
+
 <TMPL_IF errmsg>
 <TMPL_VAR NAME=errmsg>

trunk/templates/admin/confirm.tmpl

@@ +1 @@
+<TMPL_IF blockmsg><br><div class="strongwarning blockcenter w70"><TMPL_VAR NAME=blockmsg></div><br></TMPL_IF>
+
 <TMPL_IF locerr>
 <TMPL_VAR NAME=locerr>