Changeset 221

Timestamp:

04/13/05 13:24:15 (19 years ago)

Author:

Kris Deugau

Message:

/branches/acl

Basic ACL support - load ACL data from db, do or don't display
"Add Master" link, do or don't display "Admin tools" link.
Added tabledef for users/ACLs

Location:

branches/acl/cgi-bin

Files:

• IPDB.pm (modified) (5 diffs)
• ipdb.psql (modified) (1 diff)
• main.cgi (modified) (3 diffs)

branches/acl/cgi-bin/IPDB.pm

@@ -23 +23 @@
 @EXPORT_OK    = qw(
         %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist @masterblocks
-        %allocated %free %routed %bigfree
+        %allocated %free %routed %bigfree %IPDBacl
         &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock &deleteBlock
         &mailNotify
@@ -31 +31 @@
 %EXPORT_TAGS    = ( ALL => [qw(
                 %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist
-                @masterblocks %allocated %free %routed %bigfree
+                @masterblocks %allocated %free %routed %bigfree %IPDBacl
                 &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock
                 &deleteBlock &mailNotify
@@ -50 +50 @@
 our %routed;
 our %bigfree;
+our %IPDBacl;
 
 # Let's initialize the globals.
@@ -83 +84 @@
   $sth = $dbh->prepare("select cidr from masterblocks order by cidr");
   $sth->execute;
+  return (undef,$sth->errstr) if $sth->err;
   for (my $i=0; my @data = $sth->fetchrow_array(); $i++) {
     $masterblocks[$i] = new NetAddr::IP $data[0];
@@ -91 +93 @@
     $routed{"$masterblocks[$i]"} = 0;
   }
+
+  # Load ACL data.  Specific username checks are done at a different level.
+  $sth = $dbh->prepare("select username,acl from users");
+  $sth->execute;
   return (undef,$sth->errstr) if $sth->err;
+  while (my @data = $sth->fetchrow_array) {
+    $IPDBacl{$data[0]} = $data[1];
+  }
 
   return (1,"OK");

branches/acl/cgi-bin/ipdb.psql

@@ -182 +182 @@
 pr      Dynamic-route DSL netblock      Dynamic-route DSL       203     
 \.
+
+
+--
+-- User data table - required for proper ACLs
+--
+
+CREATE TABLE "users" (
+        "user" varchar(16) NOT NULL PRIMARY KEY,
+        "password" varchar(16) DEFAULT '',
+        "acl" varchar(16) DEFAULT 'b'
+);

branches/acl/cgi-bin/main.cgi

@@ -22 +22 @@
 openlog "IPDB","pid","local2";
 
+# Present HTTP AUTH headers, as well as opening content-type.
+#print 'WWW-Authenticate: Basic realm="ViaNet IP Database"\n';
 # Collect the username from HTTP auth.  If undefined, we're in a test environment.
 my $authuser;
@@ -171 +173 @@
 print qq(<div align=right style="position: absolute; right: 30px;">).
         qq(<a href="/ip/cgi-bin/admin.cgi">Admin tools</a></div><br>\n)
-        if $authuser =~ /kdeugau|jodyh|jipp/;
+        if $IPDBacl{$authuser} =~ /A/;
 
 # We print the footer here, so we don't have to do it elsewhere.
@@ -448 +450 @@
   }
   print "</table>\n";
-  print qq(<a href="/ip/addmaster.shtml">Add new master block</a><br><br>\n);
+  if ($IPDBacl{$authuser} =~ /a/) {
+    print qq(<a href="/ip/addmaster.shtml">Add new master block</a><br><br>\n);
+  }
   print "Note:  Free blocks noted here include both routed and unrouted blocks.\n";