Changeset 503 for branches

Timestamp:

09/26/11 18:05:01 (13 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Checkpoint, clearing out references to printError()
All ACL checks that generate error pages should now be converted
to use the new aclerror template. See #15.
Fix a minor bug in CustIDCK.pm - calls to custid_check are being
treated as an object call for some reason.

Location:

branches/htmlform

Files:

• cgi-bin/CustIDCK.pm (modified) (1 diff)
• cgi-bin/IPDB.pm (modified) (3 diffs)
• cgi-bin/main.cgi (modified) (9 diffs)
• ipdb.css (modified) (1 diff)
• templates/aclerror.tmpl (added)
• templates/confirm.tmpl (modified) (1 diff)
• templates/finaldelete.tmpl (modified) (2 diffs)

branches/htmlform/cgi-bin/CustIDCK.pm

@@ -31 +31 @@
 # the local admin on installation
 sub custid_exist {
+  my $self = shift;
   my $custid = shift;
 

branches/htmlform/cgi-bin/IPDB.pm

@@ -24 +24 @@
 @EXPORT_OK    = qw(
         %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist @masterblocks
-        %allocated %free %routed %bigfree %IPDBacl
+        %allocated %free %routed %bigfree %IPDBacl %aclmsg
         &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock &addMaster
         &deleteBlock &getBlockData &mailNotify
@@ -32 +32 @@
 %EXPORT_TAGS    = ( ALL => [qw(
                 %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist
-                @masterblocks %allocated %free %routed %bigfree %IPDBacl
+                @masterblocks %allocated %free %routed %bigfree %IPDBacl %aclmsg
                 &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock
                 &addMaster &deleteBlock &getBlockData &mailNotify
@@ -52 +52 @@
 our %bigfree;
 our %IPDBacl;
+
+# mapping table for functional-area => error message
+our %aclmsg = (
+        addmaster       => 'add a master block',
+        addblock        => 'add an allocation',
+        updateblock     => 'update a block',
+        delblock        => 'delete an allocation',
+        );
 
 our $org_name = 'Example Corp';

branches/htmlform/cgi-bin/main.cgi

@@ -82 +82 @@
 
 #main()
+my $aclerr;
 
 if(!defined($webvar{action})) {
@@ -98 +99 @@
 } elsif ($webvar{action} eq 'addmaster') {
   if ($IPDBacl{$authuser} !~ /a/) {
-    printError("You shouldn't have been able to get here.  Access denied.");
+    $aclerr = 'addmaster';
   }
 } elsif ($webvar{action} eq 'newmaster') {
 
   if ($IPDBacl{$authuser} !~ /a/) {
-    printError("You shouldn't have been able to get here.  Access denied.");
+    $aclerr = 'addmaster';
   } else {
     my $cidr = new NetAddr::IP $webvar{cidr};
@@ -191 +192 @@
 
 
+# Switch to a different template if we've tripped on an ACL error.
+# Note that this should only be exercised in development, when
+# deeplinked, or when being attacked;  normal ACL handling should
+# remove the links a user is not allowed to click on.
+if ($aclerr) {
+  $page = HTML::Template->new(filename => "aclerror.tmpl");
+  $page->param(ipdbfunc => $aclmsg{$aclerr});
+}
+
 
 # Clean up IPDB globals, DB handle, etc.
@@ -502 +512 @@
 
   if ($IPDBacl{$authuser} !~ /a/) {
-    printError("You shouldn't have been able to get here.  Access denied.");
+    $aclerr = 'addblock';
     return;
   }
@@ -605 +615 @@
 sub confirmAssign {
   if ($IPDBacl{$authuser} !~ /a/) {
-    printError("You shouldn't have been able to get here.  Access denied.");
+    $aclerr = 'addblock';
     return;
   }
@@ -777 +787 @@
 sub insertAssign {
   if ($IPDBacl{$authuser} !~ /a/) {
-    printError("You shouldn't have been able to get here.  Access denied.");
+    $aclerr = 'addblock';
     return;
   }
@@ -1021 +1031 @@
 sub update {
   if ($IPDBacl{$authuser} !~ /c/) {
-    printError("You shouldn't have been able to get here.  Access denied.");
+    $aclerr = 'updateblock';
     return;
   }
@@ -1125 +1135 @@
 sub remove {
   if ($IPDBacl{$authuser} !~ /d/) {
-    printError("You shouldn't have been able to get here.  Access denied.");
+    $aclerr = 'delblock';
     return;
   }
@@ -1210 +1220 @@
 sub finalDelete {
   if ($IPDBacl{$authuser} !~ /d/) {
-    $page->param(aclerr => 1);
+    $aclerr = 'delblock';
     return;
   }

branches/htmlform/ipdb.css

@@ -188 +188 @@
 .err {
         text-align: center;
-        font-size: 100%;
+        font-size: 1em;
 }
 

branches/htmlform/templates/confirm.tmpl

@@ -1 +1 @@
 <TMPL_IF err>
-<div class="err">
+<div class="regular err">
 <p><TMPL_VAR NAME=err></p>
 <input type="button" value="Back" onclick="history.go(-1)">

branches/htmlform/templates/finaldelete.tmpl

@@ -1 +1 @@
 <div class="center">
-<TMPL_IF aclerr>
-<p>You shouldn't have been able to get here.  Access denied.</p>
-<input type="button" value="Back" onclick="history.go(-1)">
-<TMPL_ELSE>
 <TMPL_IF failmsg>
 <p>Could not deallocate <TMPL_IF netblock>netblock<TMPL_ELSE>static IP</TMPL_IF> <TMPL_VAR NAME=block>: <TMPL_VAR NAME=failmsg></p>
@@ -10 +6 @@
 <div class="heading">Success!  <TMPL_VAR NAME=block> deallocated.</div>
 </TMPL_IF>
-</TMPL_IF>
 </div>