Changeset 262 for branches

Timestamp:

06/17/05 16:42:45 (19 years ago)

Author:

Kris Deugau

Message:

/branches/dns

Update branch base with trunk changes from r216:261

Location:

branches/dns

Files:

• addmaster.html (copied) (copied from trunk/addmaster.html )
• addmaster.shtml (deleted)
• alloctypes.html (modified) (2 diffs)
• cgi-bin/CommonWeb.pm (modified) (1 diff)
• cgi-bin/IPDB.pm (modified) (7 diffs)
• cgi-bin/admin.cgi (modified) (6 diffs)
• cgi-bin/extras/db2rwhois.pl (modified) (9 diffs)
• cgi-bin/ipdb.psql (modified) (9 diffs)
• cgi-bin/main.cgi (modified) (38 diffs)
• cgi-bin/search.cgi (copied) (copied from trunk/cgi-bin/search.cgi )
• changes.html (modified) (1 diff)
• compsearch.html (copied) (copied from trunk/compsearch.html )
• editDisplay.html (modified) (1 diff)
• header.inc (modified) (1 diff)
• help.html (modified) (1 diff)
• index.shtml (modified) (1 diff)

branches/dns/alloctypes.html

@@ -14 +14 @@
 <tr class="color1">
 <td>Customer netblock (default)</td><td>A direct allocation /30 or larger to a
-customer.</td>
+customer.  Note that this does NOT include RADIUS-routed "netblocks".</td>
 </tr>
 
@@ -65 +65 @@
 </tr><tr class="color1">
 <td>Dynamic cable block</td><td>Netblock for (mostly residential) DHCP cable.</td>
+</tr><tr class="color2">
+<td>Dynamic WiFi block</td><td>Netblock for (mostly residential) (mostly) PPPoE wireless.</td>
 
+</tr><tr class="color1">
+<td>Reserve for WAN blocks</td><td>Reserve a chunk of IP space for core routers/etc.</td>
 </tr><tr class="color2">
+<td>Reserve for dynamic-route DSL netblocks</td><td>Reserve a chunk of IP space for
+RADIUS-assigned "netblocks" from a PPPoE pool.  Note that this is similar to the static DSL
+pool, but IP space is to be allocated as /30 and larger netblocks, not single static IPs.</td>
+</tr><tr class="color1">
+<td>WAN block</td><td>Individual netblock assignment for a core router.  Always taken from a
+block which has previously been reserved for such assignments.</td>
+</tr><tr class="color2">
+<td>Dynamic-route DSL netblock</td><td>Customer assignment for a RADIUS-assigned PPPoE
+"netblock".</td>
+
+</tr><tr class="color1">
 <td>Routing</td><td>Blocks not actually assigned to a service on their own, but which
 have been routed to individual POPs- typically /24, /23, /22</td>
 
-</tr><tr class="color1">
+</tr><tr class="color2">
 <td>Master block</td><td>Our allocations from ARIN</td>
 </tr>

branches/dns/cgi-bin/CommonWeb.pm

@@ -53 +53 @@
 }
 
-sub printHeader($) #(cgiurl)
-{
-        my $cgiURL = $_[0];
-        print "Content-type: text/html\n\n";
-        open(FILE, "../header.inc") || die $!;
-        while (<FILE>) 
-        {
-                $_ =~ s/\$\$CGIURL\$\$/$cgiURL/g;
-                print $_;
-        }
-        close(FILE);
+
+sub printHeader {
+  my $title = shift;
+  print "Content-type: text/html\n\n";
+# This doesn't work well.  Must investigate.
+#  my $realm = shift;
+#  print qq(WWW-Authenticate: Basic realm="$realm"\n) if $realm;
+  open FILE, "../header.inc"
+        or carp $!;
+  my $html = join('',<FILE>);
+  close FILE;
+
+  $html =~ s/\$\$TITLE\$\$/$title/;
+# Necessary for mangling arbitrary bits of the header
+  my $i=0;
+  while (defined(my $param = shift)) {
+    $html =~ s/\$\$EXTRA$i\$\$/$param/g;
+    $i++;
+  }
+  print $html;
 }
 

branches/dns/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");
@@ -375 +384 @@
       }; # end eval
       if ($@) {
+        $msg .= ": ".$@;
         eval { $dbh->rollback; };
         return ('FAIL',$msg);
@@ -416 +426 @@
     my @poolip_list = $pool->hostenum;
     if ($class eq 'all') { # (DSL-ish block - *all* IPs available
-      $sth->execute($pool->addr);
+      if ($pool->addr !~ /\.0$/) {      # .0 causes weirdness.
+        $sth->execute($pool->addr);
+      }
       for (my $i=0; $i<=$#poolip_list; $i++) {
         $sth->execute($poolip_list[$i]->addr);
       }
       $pool--;
-      $sth->execute($pool->addr);
+      if ($pool->addr !~ /\.255$/) {    # .255 can cause weirdness.
+        $sth->execute($pool->addr);
+      }
     } else { # (real netblock)
       for (my $i=1; $i<=$#poolip_list; $i++) {

branches/dns/cgi-bin/admin.cgi

@@ -33 +33 @@
 }
 
-if ($authuser !~ /^(kdeugau|jodyh|jipp)$/) {
-  print "Content-Type: text/html\n\n".
-        "<html><head><title>Access denied</title></head><body>\n".
-        'Access to this tool is restricted.  Contact <a href="mailto:kdeugau@vianet.ca">Kris</a> '.
-        "for more information.</body></html>\n";
-  exit;
-}
-
 syslog "debug", "$authuser active";
 
@@ -53 +45 @@
 }
 initIPDBGlobals($ip_dbh);
+
+if ($IPDBacl{$authuser} !~ /A/) {
+  print "Content-Type: text/html\n\n".
+        "<html><head><title>Access denied</title></head><body>\n".
+        'Access to this tool is restricted.  Contact <a href="mailto:kdeugau@vianet.ca">Kris</a> '.
+        "for more information.</body></html>\n";
+  exit;
+}
 
 my %webvar = parse_post();
@@ -90 +90 @@
 </form>
 <hr><a href="admin.cgi?action=showpools">List IP Pools</a> for manual tweaking and updates
+<hr><a href="admin.cgi?action=showusers">Manage users</a> (add/remove users;  change
+internal access controls - note that this does NOT include IP-based limits)
 );
 } else {
@@ -123 +125 @@
     printAndExit("Can't allocate from outside a free block!!\n")
         if !$data[0];
+  } elsif ($webvar{alloctype} =~ /^(.)i$/) {
+    $sth = $ip_dbh->prepare("select cidr from allocations where cidr >>='$cidr' and (type like '_d' or type like '_p')");
+    $sth->execute;
+    @data = $sth->fetchrow_array;
+# User deserves errors if user can't be bothered to find the pool and a free IP first.
+    printAndExit("Can't allocate static IP from outside a pool!!\n")
+        if !$data[0];
   } else {
     $sth = $ip_dbh->prepare("select cidr from freeblocks where cidr >>='$cidr' and not (routed='n')");
@@ -202 +211 @@
       print "Allocation failed!  IPDB::allocateBlock said:\n$msg\n";
       syslog "err", "($authuser) Allocation of '$webvar{cidr}' to '$webvar{custid}' as ".
-        "'$webvar{type}' failed: '$msg'";
+        "'$webvar{alloctype}' failed: '$msg'";
     }
   } # done city check
@@ -267 +276 @@
     syslog "notice", "$authuser updated pool IP $webvar{ip}";
   }
-#  showPool("$data[0]");
-#} else {
-#  print "webvar{action} check failed: $webvar{action}";
+} elsif ($webvar{action} eq 'showusers') {
+  print "Notes:<br>\n".
+        "<li>Admin users automatically get all other priviledges.\n".
+        "<hr>Add new user:<form action=admin.cgi method=POST>\n".
+        "Username: <input name=username><br>\n".
+        "Password: <input name=password> <input type=checkbox name=preenc>Password is pre-encrypted (MUST be crypt() encrypted)<br>\n".
+        "<input type=submit value='Add user'><input type=hidden name=action value=newuser></form>\n";
+
+  print "<hr>Users with access:\n<table border=1>\n";
+  print "<tr><td>Username</td><td>Add new</td><td>Change</td>".
+        "<td>Delete</td><td>Admin user</td></tr>\n".
+        "<form action=admin.cgi method=POST>\n";
+  $sth = $ip_dbh->prepare("select username,acl from users order by username");
+  $sth->execute;
+  while (my @data = $sth->fetchrow_array) {
+    print "<form action=admin.cgi method=POST><input type=hidden name=action value=updacl>".
+        qq(<tr><td>$data[0]<input type=hidden name=username value="$data[0]"></td><td>).
+    # Now for the fun bit.  We have to pull apart the ACL field and
+    # output a bunch of checkboxes.
+        "<input type=checkbox name=add".($data[1] =~ /a/ ? ' checked=y' : '').
+        "></td><td><input type=checkbox name=change".($data[1] =~ /c/ ? ' checked=y' : '').
+        "></td><td><input type=checkbox name=del".($data[1] =~ /d/ ? ' checked=y' : '').
+        "></td><td><input type=checkbox name=admin".($data[1] =~ /A/ ? ' checked=y' : '').
+        qq(></td><td><input type=submit value="Update"></td></form>\n).
+        "<form action=admin.cgi method=POST><td><input type=hidden name=action value=deluser>".
+        "<input type=hidden name=username value=$data[0]>".
+        qq(<input type=submit value="Delete user"></tr></form>\n);
+
+  }
+  print "</table>\n";
+} elsif ($webvar{action} eq 'updacl') {
+  print "Updating ACL for $webvar{username}:<br>\n";
+  my $acl = 'b';
+  if ($webvar{admin} eq 'on') {
+    $acl .= "acdA";
+  } else {
+    $acl .= ($webvar{add} eq 'on' ? 'a' : '').
+        ($webvar{change} eq 'on' ? 'c' : '').
+        ($webvar{del} eq 'on' ? 'd' : '');
+  }
+  print "New ACL: $acl<br>\n";
+
+  $sth = $ip_dbh->prepare("update users set acl='$acl' where username='$webvar{username}'");
+  $sth->execute;
+  print "OK\n" if !$sth->err;
+
+  print qq(<hr><a href="admin.cgi?action=showusers">Back</a> to user listing\n);
+
+} elsif ($webvar{action} eq 'newuser') {
+  print "Adding user $webvar{username}...\n";
+  my $cr_pass = ($webvar{preenc} ? $webvar{password} :
+        crypt $webvar{password}, join('',('.','/',0..9,'A'..'Z','a'..'z')[rand 64, rand 64]));
+  $sth = $ip_dbh->prepare("insert into users (username,password,acl) values ".
+        "('$webvar{username}','$cr_pass','b')");
+  $sth->execute;
+  if ($sth->err) {
+    print "<br>Error adding user: ".$sth->errstr;
+  } else {
+    print "OK\n";
+  }
+
+  print qq(<hr><a href="admin.cgi?action=showusers">Back</a> to user listing\n);
+
+} elsif ($webvar{action} eq 'deluser') {
+  print "Deleting user $webvar{username}.<br>\n";
+  $sth = $ip_dbh->prepare("delete from users where username='$webvar{username}'");
+  $sth->execute;
+  print "OK\n" if !$sth->err;
+
+  print qq(<hr><a href="admin.cgi?action=showusers">Back</a> to user listing\n);
+
+} elsif ($webvar{action} ne '<NULL>') {
+  print "webvar{action} check failed: Don't know how to $webvar{action}";
 }
 

branches/dns/cgi-bin/extras/db2rwhois.pl

@@ -17 +17 @@
 use NetAddr::IP;
 use MyIPDB;
+use Digest::MD5 qw(md5_hex);
 
 $ENV{"PATH"} = "/bin;/usr/bin";
@@ -41 +42 @@
 # Note that this ASS-U-MEs that we do not add master IP blocks-
 # there should probably be a separate system for doing that.
-my $sth = $dbh->prepare("select * from masterblocks;");
+my $sth = $dbh->prepare("select cidr,ctime from masterblocks;");
 $sth->execute;
 my $i=0;
 GETMASTERS: while (my @data = $sth->fetchrow_array()) {
 
-  if ($data[0] =~ /^(192.168.0.0|172.16.0.0|10.0.0.0)/) {
-    next GETMASTERS;
-  }
+#  if ($data[0] =~ /^(192.168.0.0|172.16.0.0|10.0.0.0)/) {
+#    next GETMASTERS;
+#  }
   $masterblocks[$i] = new NetAddr::IP $data[0];
 
@@ -55 +56 @@
   my $date;
   chomp ($date = `/bin/date +"%Y%m%d"`);
+  my ($ctime,undef) = split /\s+/, $data[1];
 
 # Whew!  Ugly little varmint.
@@ -73 +75 @@
         "Admin-Contact: ISP-ARIN-HANDLE\n".
         "Abuse-Contact: abuse\@example.com\n".
-        "Created: 20040308\n".
+        "Created: $ctime\n".
         "Updated: $date\n".
         "Updated-By: noc\@example.com\n";
@@ -87 +89 @@
 # Make sure to remove the private netblocks from this.
 # No use or point in broadcasting our use of them.
-$sth = $dbh->prepare("select * from allocations where not (cidr <<= '192.168.0.0/16') and not (cidr <<= '172.16.0.0/12') and not (cidr <<= '10.0.0.0/8') and custid='6750400'");
+#$sth = $dbh->prepare("select * from allocations where not (cidr <<= '192.168.0.0/16') and not (cidr <<= '172.16.0.0/12') and not (cidr <<= '10.0.0.0/8')");
+# cidr,custid,type,city,description,notes,maskbits,circuitid,createstamp,modifystamp,newcustid
+
+$sth = $dbh->prepare("select cidr,custid,type,city,description,createstamp,modifystamp from allocations");
 $sth->execute;
 
-while (my @data = $sth->fetchrow_array()) {
+while (my ($cidr,$custid,$type,$city,$description,$ctime,$mtime) = $sth->fetchrow_array()) {
 
 # We get master block info from @masterblocks.
@@ -105 +110 @@
  # Updated-By: noc@example.com
 
-  # Get the "full" network number
-  my $net = new NetAddr::IP $data[0];
+  # Get the "full" network number - just in case.
+  my $net = new NetAddr::IP $cidr;
 
 # Assumptions:  All data in ipdb is public
@@ -121 +126 @@
         or print "File open error: '$!' on '$rwhoisDataPath/$masterfilename'\n";
 
-# cidr custid type city description notes maskbits
-
-# Creation date in record to eventually be "correct";  near-term will
-# be master's creation date;  immediate is today's date.
-my $date;
-      chomp ($date = `/bin/date +"%Y%m%d"`);
 if ($data[4] =~ /^\s*$/) { $data[4] = 'Friendly ISP'; }
+print "$type-type $net for $custid, created $ctime, modified $mtime\n";
       print MASTERFILE "---\nID: NETBLK-ISP.$master\n".
         "Auth-Area: $master\n".
@@ -133 +133 @@
         "IP-Network: $net\n".
         "IP-Network-Block: ".$net->range."\n".
-        "Organization: $data[4]\n".
+        "Organization: $description\n".
 #       "Tech-Contact: $data[9]\n".
         "Tech-Contact: abuse\@example.com\n".
         "Admin-Contact: ISP-ARIN-HANDLE\n".
-        "Created: $date\n".
-        "Updated: $date\n".
+        "Created: $ctime\n".
+        "Updated: $mtime\n".
         "Updated-By: noc\@example.com\n";
     }
@@ -154 +154 @@
 
 $dbh->disconnect;
+
+# This doesn't work, with a vengeance.
+#print qx{ /usr/bin/rwhois_indexer -c /etc/rwhoisd/rwhoisd.conf -i -v -s txt };

branches/dns/cgi-bin/ipdb.psql

@@ -23 +23 @@
 
 CREATE TABLE "masterblocks" (
-        "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL PRIMARY KEY
+        "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL PRIMARY KEY,
+        "ctime" timestamp DEFAULT now()
 );
 
@@ -33 +34 @@
         "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL PRIMARY KEY,
         "maskbits" integer DEFAULT 128,
-        "city" character varying(30) DEFAULT ''
+        "city" character varying(30) DEFAULT '',
+        "ctime" timestamp DEFAULT now()
 );
 
@@ -70 +72 @@
         "circuitid" character varying(128) DEFAULT '' NOT NULL,
         "newcustid" integer,
+        "createstamp" timestamp DEFAULT now(),
+        "modifystamp" timestamp DEFAULT now(),
         CHECK (((available = 'y'::bpchar) OR (available = 'n'::bpchar)))
 );
@@ -86 +90 @@
         "maskbits" integer DEFAULT 128,
         "circuitid" character varying(128) DEFAULT '',
+        "createstamp" timestamp DEFAULT now(),
+        "modifystamp" timestamp DEFAULT now(),
         "newcustid" integer
 );
@@ -112 +118 @@
 
 CREATE TABLE "cities" (
-        "city" character varying(30) DEFAULT '' NOT NULL PRIMARY KEY,
+        "id" serial NOT NULL PRIMARY KEY,
+        "city" character varying(30) DEFAULT '' NOT NULL,
         "routing" character(1) DEFAULT 'n' NOT NULL
 );
@@ -119 +126 @@
 GRANT ALL on "cities" to "kdeugau";
 GRANT ALL on "cities" to "ipdb";
-
---
--- Selected TOC Entries:
---
-\connect - ipdb
-
---
--- TOC Entry ID 2 (OID 92809)
---
--- Name: alloctypes Type: TABLE Owner: ipdb
---
 
 CREATE TABLE "alloctypes" (
@@ -140 +136 @@
 );
 
---
--- TOC Entry ID 3 (OID 92809)
---
--- Name: alloctypes Type: ACL Owner: 
---
-
 REVOKE ALL on "alloctypes" from PUBLIC;
 GRANT ALL on "alloctypes" to "kdeugau";
 GRANT ALL on "alloctypes" to "ipdb";
-
---
--- Data for TOC Entry ID 4 (OID 92809)
---
--- Name: alloctypes Type: TABLE DATA Owner: ipdb
---
-
 
 COPY "alloctypes" FROM stdin;
@@ -172 +155 @@
 si      Static IP - Server pool Server pool IP  20      6750400
 wc      Reserve for WAN blocks  WAN IP blocks   200     6750400
-wr      Internal WAN block      Internal WAN block      201     6750400
-pc      Reserve for dynamic-route DSL netblocks Dynamic-route netblocks 202     6750400
 en      End-use netblock        End-use netblock        100     6750400
 me      Dialup netblock Dialup netblock 101     DIAL-RES
@@ -180 +161 @@
 we      Dynamic WiFi block      Dynamic WiFi block      104     WL-RES
 rm      Routing Routed netblock 500     6750400
-pr      Dynamic-route DSL netblock      Dynamic-route DSL       203     
+pc      Reserve for dynamic-route DSL netblocks Dynamic-route netblocks 201     6750400
+pr      Dynamic-route DSL netblock      Dynamic-route DSL       221     
+wr      WAN block       WAN block       220     6750400
 \.
+
+--
+-- Trigger and matching function to update modifystamp on allocations, poolips
+--
+CREATE FUNCTION up_modtime () RETURNS OPAQUE AS '
+    BEGIN
+        NEW.modifystamp := ''now'';
+        RETURN NEW;
+    END;
+' LANGUAGE 'plpgsql';
+
+CREATE TRIGGER up_modtime BEFORE UPDATE ON allocations
+    FOR EACH ROW EXECUTE PROCEDURE up_modtime();
+
+CREATE TRIGGER up_modtime BEFORE UPDATE ON poolips
+    FOR EACH ROW EXECUTE PROCEDURE up_modtime();
+
+--
+-- User data table - required for proper ACLs
+--
+
+CREATE TABLE "users" (
+        "username" varchar(16) NOT NULL PRIMARY KEY,
+        "password" varchar(16) DEFAULT '',
+        "acl" varchar(16) DEFAULT 'b'
+);
+
+CREATE TABLE "dns" (
+        "ip" inet NOT NULL PRIMARY KEY,
+        "hostname" character varying(128),
+        "auto" character(1) DEFAULT 'y'
+);

branches/dns/cgi-bin/main.cgi

@@ -22 +22 @@
 openlog "IPDB","pid","local2";
 
-# Collect the username from HTTP auth.  If undefined, we're in a test environment.
+# Collect the username from HTTP auth.  If undefined, we're in
+# a test environment, or called without a username.
 my $authuser;
 if (!defined($ENV{'REMOTE_USER'})) {
@@ -39 +40 @@
 ($ip_dbh,$errstr) = connectDB_My;
 if (!$ip_dbh) {
-  printAndExit("Database error: $errstr\n");
+  exitError("Database error: $errstr\n");
 }
 initIPDBGlobals($ip_dbh);
 
-#prototypes
-sub viewBy($$);         # feed it the category and query
-sub queryResults($$$);  # args is the sql, the page# and the rowCount
-# Needs rewrite/rename
-sub countRows($);       # returns first element of first row of passed SQL
-                        # Only usage passes "select count(*) ..."
+# Headerize!  Make sure we replace the $$EXTRA0$$ bit as needed.
+printHeader('', ($IPDBacl{$authuser} =~ /a/ ?
+        '<td align=right><a href="/ip/cgi-bin/main.cgi?action=assign">Add new assignment</a>' : ''
+        ));
+
 
 # Global variables
-my $RESULTS_PER_PAGE = 50;
 my %webvar = parse_post();
 cleanInput(\%webvar);
@@ -64 +63 @@
 if($webvar{action} eq 'index') {
   showSummary();
+} elsif ($webvar{action} eq 'addmaster') {
+  if ($IPDBacl{$authuser} !~ /a/) {
+    printError("You shouldn't have been able to get here.  Access denied.");
+  } else {
+    open HTML, "<../addmaster.html";
+    print while <HTML>;
+  }
 } elsif ($webvar{action} eq 'newmaster') {
-  printHeader('');
-
-  my $cidr = new NetAddr::IP $webvar{cidr};
-
-  print "<div type=heading align=center>Adding $cidr as master block....</div>\n";
-
-  # Allow transactions, and raise an exception on errors so we can catch it later.
-  # Use local to make sure these get "reset" properly on exiting this block
-  local $ip_dbh->{AutoCommit} = 0;
-  local $ip_dbh->{RaiseError} = 1;
-
-  # Wrap the SQL in a transaction
-  eval {
-    $sth = $ip_dbh->prepare("insert into masterblocks values ('$webvar{cidr}')");
-    $sth->execute;
+
+  if ($IPDBacl{$authuser} !~ /a/) {
+    printError("You shouldn't have been able to get here.  Access denied.");
+  } else {
+
+    my $cidr = new NetAddr::IP $webvar{cidr};
+
+    print "<div type=heading align=center>Adding $cidr as master block....</div>\n";
+
+    # Allow transactions, and raise an exception on errors so we can catch it later.
+    # Use local to make sure these get "reset" properly on exiting this block
+    local $ip_dbh->{AutoCommit} = 0;
+    local $ip_dbh->{RaiseError} = 1;
+
+    # Wrap the SQL in a transaction
+    eval {
+      $sth = $ip_dbh->prepare("insert into masterblocks values ('$webvar{cidr}')");
+      $sth->execute;
 
 # Unrouted blocks aren't associated with a city (yet).  We don't rely on this
@@ -85 +94 @@
 # Thus the "routed" flag.
 
-    $sth = $ip_dbh->prepare("insert into freeblocks (cidr,maskbits,city,routed)".
+      $sth = $ip_dbh->prepare("insert into freeblocks (cidr,maskbits,city,routed)".
         " values ('$webvar{cidr}',".$cidr->masklen.",'<NULL>','n')");
-    $sth->execute;
-
-    # If we get here, everything is happy.  Commit changes.
-    $ip_dbh->commit;
-  }; # end eval
-
-  if ($@) {
-    carp "Transaction aborted because $@";
-    eval { $ip_dbh->rollback; };
-    syslog "err", "Could not add master block '$webvar{cidr}' to database: '$@'";
-    printError("Could not add master block $webvar{cidr} to database: $@");
-  } else {
-    print "<div type=heading align=center>Success!</div>\n";
-    syslog "info", "$authuser added master block $webvar{cidr}";
-  }
+      $sth->execute;
+
+      # If we get here, everything is happy.  Commit changes.
+      $ip_dbh->commit;
+    }; # end eval
+
+    if ($@) {
+      carp "Transaction aborted because $@";
+      eval { $ip_dbh->rollback; };
+      syslog "err", "Could not add master block '$webvar{cidr}' to database: '$@'";
+      printError("Could not add master block $webvar{cidr} to database: $@");
+    } else {
+      print "<div type=heading align=center>Success!</div>\n";
+      syslog "info", "$authuser added master block $webvar{cidr}";
+    }
+
+  } # ACL check
 
 } # end add new master
@@ -113 +124 @@
 elsif($webvar{action} eq 'listpool') {
   listPool();
-}
-elsif($webvar{action} eq 'search') {
-  printHeader('');
-  if (!$webvar{input}) {
-    # No search term.  Display everything.
-    viewBy('all', '');
-  } else {
-    # Search term entered.  Display matches.
-    # We should really sanitize $webvar{input}, no?
-    viewBy($webvar{searchfor}, $webvar{input});
-  }
 }
 
@@ -153 +153 @@
 # which is not in any way guaranteed to provide anything useful.
 else {
-  printHeader('');
   my $rnd = rand 500;
   my $boing = sprintf("%.2f", rand 500);
@@ -171 +170 @@
 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.
@@ -181 +180 @@
 
 
-sub viewBy($$) {
-  my ($category,$query) = @_;
-
-  # Local variables
-  my $sql;
-
-#print "<pre>\n";
-
-#print "start querysub: query '$query'\n";
-# this may happen with more than one subcategory.  Unlikely, but possible.
-
-  # Calculate start point for LIMIT clause
-  my $offset = ($webvar{page}-1)*$RESULTS_PER_PAGE;
-
-# Possible cases:
-# 1) Partial IP/subnet.  Treated as "first-three-octets-match" in old IPDB,
-#    I should be able to handle it similarly here.
-# 2a) CIDR subnet.  Treated more or less as such in old IPDB.
-# 2b) CIDR netmask.  Not sure how it's treated.
-# 3) Customer ID.  Not handled in old IPDB
-# 4) Description.
-# 5) Invalid data which might be interpretable as an IP or something, but
-#    which probably shouldn't be for reasons of sanity.
-
-  if ($category eq 'all') {
-
-    print qq(<div class="heading">Showing all netblock and static-IP allocations</div><br>\n);
-
-    # Need to assemble SQL query in this order to avoid breaking things.
-    $sql = "select cidr,custid,type,city,description from searchme";
-    my $count = countRows("select count(*) from ($sql) foo");
-    $sql .= " order by cidr limit $RESULTS_PER_PAGE offset $offset";
-    queryResults($sql, $webvar{page}, $count);
-
-  } elsif ($category eq 'cust') {
-
-    print qq(<div class="heading">Searching for Customer IDs containing '$query'</div><br>\n);
-
-    # Query for a customer ID.  Note that we can't restrict to "numeric-only"
-    # as we have non-numeric custIDs in the legacy data.  :/
-    $sql = "select cidr,custid,type,city,description from searchme where custid ilike '%$query%'";
-    my $count = countRows("select count(*) from ($sql) foo");
-    $sql .= " order by cidr limit $RESULTS_PER_PAGE offset $offset";
-    queryResults($sql, $webvar{page}, $count);
-
-  } elsif ($category eq 'desc') {
-
-    print qq(<div class="heading">Searching for descriptions containing '$query'</div><br>\n);
-    # Query based on description (includes "name" from old DB).
-    $sql = "select cidr,custid,type,city,description from searchme where description ilike '%$query%'";
-    my $count = countRows("select count(*) from ($sql) foo");
-    $sql .= " order by cidr limit $RESULTS_PER_PAGE offset $offset";
-    queryResults($sql, $webvar{page}, $count);
-
-  } elsif ($category =~ /ipblock/) {
-
-    # Query is for a partial IP, a CIDR block in some form, or a flat IP.
-    print qq(<div class="heading">Searching for IP-based matches on '$query'</div><br>\n);
-
-    $query =~ s/\s+//g;
-    if ($query =~ /\//) {
-      # 209.91.179/26 should show all /26 subnets in 209.91.179
-      my ($net,$maskbits) = split /\//, $query;
-      if ($query =~ /^(\d{1,3}\.){3}\d{1,3}\/\d{2}$/) {
-        # /0->/9 are silly to worry about right now.  I don't think
-        # we'll be getting a class A anytime soon.  <g>
-        $sql = "select cidr,custid,type,city,description from searchme where cidr='$query'";
-        queryResults($sql, $webvar{page}, 1);
-      } else {
-        print "Finding all blocks with netmask /$maskbits, leading octet(s) $net<br>\n";
-        # Partial match;  beginning of subnet and maskbits are provided
-        $sql = "select cidr,custid,type,city,description from searchme where ".
-                "text(cidr) like '$net%' and text(cidr) like '%$maskbits'";
-        my $count = countRows("select count(*) from ($sql) foo");
-        $sql .= " order by cidr limit $RESULTS_PER_PAGE offset $offset";
-        queryResults($sql, $webvar{page}, $count);
-      }
-    } elsif ($query =~ /^(\d{1,3}\.){3}\d{1,3}$/) {
-      # Specific IP address match
-      my $sfor = new NetAddr::IP $query;
-# We do this convoluted roundabout way of finding things in order
-# to bring up matches for single IPs that are within a static block;
-# we want to show both the "container" block and the static IP itself.
-      $sth = $ip_dbh->prepare("select cidr from searchme where cidr >>= '$sfor'");
-      $sth->execute;
-      while (my @data = $sth->fetchrow_array()) {
-        my $cidr = new NetAddr::IP $data[0];
-        queryResults("select cidr,custid,type,city,description from searchme where ".
-                "cidr='$cidr'", $webvar{page}, 1);
-      }
-    } elsif ($query =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.?$/) {
-      print "Finding matches where the first three octets are $query<br>\n";
-      $sql = "select cidr,custid,type,city,description from searchme where ".
-                "text(cidr) like '$query%'";
-      my $count = countRows("select count(*) from ($sql) foo");
-      $sql .= " order by cidr limit $RESULTS_PER_PAGE offset $offset";
-      queryResults($sql, $webvar{page}, $count);
-    } else {
-      # This shouldn't happen, but if it does, whoever gets it deserves what they get...
-      printError("Invalid query.");
-    }
-  } else {
-    # This shouldn't happen, but if it does, whoever gets it deserves what they get...
-    printError("Invalid searchfor.");
-  }
-} # viewBy
-
-
 # args are: a reference to an array with the row to be printed and the 
 # class(stylesheet) to use for formatting.
@@ -313 +204 @@
 
 
-# Display certain types of search query.  Note that this can't be
-# cleanly reused much of anywhere else as the data isn't neatly tabulated.
-# This is tied to the search sub tightly enough I may just gut it and provide
-# more appropriate tables directly as needed.
-sub queryResults($$$) {
-  my ($sql, $pageNo, $rowCount) = @_;
-  my $offset = 0;
-  $offset = $1 if($sql =~ m/.*limit\s+(.*),.*/);
-
-  my $sth = $ip_dbh->prepare($sql);
-  $sth->execute();
-
-  startTable('Allocation','CustID','Type','City','Description/Name');
-  my $count = 0;
-
-  while (my @data = $sth->fetchrow_array) {
-    # cidr,custid,type,city,description
-    # Prefix subblocks with "Sub "
-    my @row = ( (($data[2] =~ /^.r$/) ? 'Sub ' : '').
-        qq(<a href="/ip/cgi-bin/main.cgi?action=edit&block=$data[0]">$data[0]</a>),
-        $data[1], $disp_alloctypes{$data[2]}, $data[3], $data[4]);
-    # Allow listing of pool if desired/required.
-    if ($data[2] =~ /^.[pd]$/) {
-      $row[0] .= ' &nbsp; <a href="/ip/cgi-bin/main.cgi?action=listpool'.
-        "&pool=$data[0]\">List IPs</a>";
-    }
-    printRow(\@row, 'color1', 1) if ($count%2==0); 
-    printRow(\@row, 'color2', 1) if ($count%2!=0);
-    $count++;
-  }
-
-  # Have to think on this call, it's primarily to clean up unfetched rows from a select.
-  # In this context it's probably a good idea.
-  $sth->finish();
-
-  my $upper = $offset+$count;
-  print "<tr><td colspan=10 bgcolor=white class=regular>Records found: $rowCount<br><i>Displaying: $offset - $upper</i></td></tr>\n";
-  print "</table></center>\n";
-
-  # print the page thing..
-  if ($rowCount > $RESULTS_PER_PAGE) {
-    my $pages = ceil($rowCount/$RESULTS_PER_PAGE);
-    print qq(<div class="center"> Page: );
-    for (my $i = 1; $i <= $pages; $i++) {
-      if ($i == $pageNo) {
-        print "<b>$i&nbsp;</b>\n";
-      } else {
-        print qq(<a href="/ip/cgi-bin/main.cgi?page=$i&input=$webvar{input}&action=search&searchfor=$webvar{searchfor}">$i</a>&nbsp;\n);
-      }
-    }
-    print "</div>";
-  }
-} # queryResults
-
-
 # Prints table headings.  Accepts any number of arguments;
 # each argument is a table heading.
@@ -380 +216 @@
 
 
-# Return first element of passed SQL query
-sub countRows($) {
-  my $sth = $ip_dbh->prepare($_[0]);
-  $sth->execute();
-  my @a = $sth->fetchrow_array();
-  $sth->finish();
-  return $a[0];
-}
-
-
 # Initial display:  Show master blocks with total allocated subnets, total free subnets
 sub showSummary {
-  # this is horrible-ugly-bad and will Go Away real soon now(TM)
-  print "Content-type: text/html\n\n";
 
   startTable('Master netblock', 'Routed netblocks', 'Allocated netblocks',
@@ -420 +244 @@
 
   # Count the free blocks.
-  $sth = $ip_dbh->prepare("select count(*) from freeblocks where cidr <<= ?");
+  $sth = $ip_dbh->prepare("select count(*) from freeblocks where cidr <<= ? and ".
+        "(routed='y' or routed='n')");
   foreach my $master (@masterblocks) {
     $sth->execute("$master");
@@ -428 +253 @@
 
   # Find the largest free block in each master
-  $sth = $ip_dbh->prepare("select maskbits from freeblocks where cidr <<= ? order by maskbits limit 1");
+  $sth = $ip_dbh->prepare("select maskbits from freeblocks where cidr <<= ? and ".
+        "(routed='y' or routed='n') order by maskbits limit 1");
   foreach my $master (@masterblocks) {
     $sth->execute("$master");
@@ -448 +274 @@
   }
   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/cgi-bin/main.cgi?action=addmaster">Add new master block</a><br><br>\n);
+  }
   print "Note:  Free blocks noted here include both routed and unrouted blocks.\n";
 
@@ -460 +288 @@
 # else should follow.  YMMV.)
 sub showMaster {
-  printHeader('');
 
   print qq(<center><div class="heading">Summarizing routed blocks for ).
@@ -502 +329 @@
 
     # Count the free blocks.
-    $sth = $ip_dbh->prepare("select count(*) from freeblocks where cidr <<= ?");
+    $sth = $ip_dbh->prepare("select count(*) from freeblocks where cidr <<= ? and ".
+        "(routed='y' or routed='n')");
     foreach my $master (@localmasters) {
       $sth->execute("$master");
@@ -510 +338 @@
 
     # Get the size of the largest free block
-    $sth = $ip_dbh->prepare("select maskbits from freeblocks where cidr <<= ? order by maskbits limit 1");
+    $sth = $ip_dbh->prepare("select maskbits from freeblocks where cidr <<= ? and ".
+        "(routed='y' or routed='n') order by maskbits limit 1");
     foreach my $master (@localmasters) {
       $sth->execute("$master");
@@ -534 +363 @@
     print qq(<hr width="60%"><center><div class="heading">No allocations in ).
         qq($master.</div>\n).
-        qq(<form action="/ip/cgi-bin/main.cgi" method=POST>\n).
-        qq(<input type=hidden name=action value="delete">\n).
-        qq(<input type=hidden name=block value="$master">\n).
-        qq(<input type=hidden name=alloctype value="mm">\n).
-        qq(<input type=submit value=" Remove this master ">\n).
-        qq(</form></center>\n);
+        ($IPDBacl{$authuser} =~ /d/ ?
+                qq(<form action="/ip/cgi-bin/main.cgi" method=POST>\n).
+                qq(<input type=hidden name=action value="delete">\n).
+                qq(<input type=hidden name=block value="$master">\n).
+                qq(<input type=hidden name=alloctype value="mm">\n).
+                qq(<input type=submit value=" Remove this master ">\n).
+                qq(</form></center>\n) :
+                '');
 
   } # end check for existence of routed blocks in master
@@ -573 +404 @@
 # not have anything useful to spew.
 sub showRBlock {
-  printHeader('');
 
   my $master = new NetAddr::IP $webvar{block};
@@ -621 +451 @@
     print qq(<hr width="60%"><center><div class="heading">No allocations in ).
         qq($master.</div></center>\n).
-        qq(<form action="/ip/cgi-bin/main.cgi" method=POST>\n).
-        qq(<input type=hidden name=action value="delete">\n).
-        qq(<input type=hidden name=block value="$master">\n).
-        qq(<input type=hidden name=alloctype value="rm">\n).
-        qq(<input type=submit value=" Remove this block ">\n).
-        qq(</form>\n);
+        ($IPDBacl{$authuser} =~ /d/ ?
+                qq(<form action="/ip/cgi-bin/main.cgi" method=POST>\n).
+                qq(<input type=hidden name=action value="delete">\n).
+                qq(<input type=hidden name=block value="$master">\n).
+                qq(<input type=hidden name=alloctype value="rm">\n).
+                qq(<input type=submit value=" Remove this block ">\n).
+                qq(</form>\n) :
+                '');
   }
 
@@ -645 +477 @@
     # Include some HairyPerl(TM) to prefix subblocks with "Sub "
     my @row = ((($data[1] ne 'y' && $data[1] ne 'n') ? 'Sub ' : '').
-        qq(<a href="/ip/cgi-bin/main.cgi?action=assign&block=$cidr&fbtype=$data[1]">$cidr</a>),
+        ($IPDBacl{$authuser} =~ /a/ ? qq(<a href="/ip/cgi-bin/main.cgi?action=assign&block=$cidr&fbtype=$data[1]">$cidr</a>) : $cidr),
         $cidr->range);
     printRow(\@row, 'color1') if ($count%2 == 0);
@@ -658 +490 @@
 # List the IPs used in a pool
 sub listPool {
-  printHeader('');
 
   my $cidr = new NetAddr::IP $webvar{pool};
@@ -704 +535 @@
     my @row = ( qq(<a href="/ip/cgi-bin/main.cgi?action=edit&block=$data[0]">$data[0]</a>),
         $data[1],$data[2],$data[3],
-        ( ($data[2] eq 'n') ?
+        ( (($data[2] eq 'n') && ($IPDBacl{$authuser} =~ /d/)) ?
           ("<a href=\"/ip/cgi-bin/main.cgi?action=delete&block=$data[0]&".
            "alloctype=$data[4]\">Unassign this IP</a>") :
@@ -721 +552 @@
 # be one of two templates, and the lists come from the database.
 sub assignBlock {
-  printHeader('');
+
+  if ($IPDBacl{$authuser} !~ /a/) {
+    printError("You shouldn't have been able to get here.  Access denied.");
+    return;
+  }
 
   my $html;
@@ -799 +634 @@
 # Take info on requested IP assignment and see what we can provide.
 sub confirmAssign {
-  printHeader('');
+  if ($IPDBacl{$authuser} !~ /a/) {
+    printError("You shouldn't have been able to get here.  Access denied.");
+    return;
+  }
 
   my $cidr;
@@ -958 +796 @@
 # Do the work of actually inserting a block in the database.
 sub insertAssign {
+  if ($IPDBacl{$authuser} !~ /a/) {
+    printError("You shouldn't have been able to get here.  Access denied.");
+    return;
+  }
   # Some things are done more than once.
-  printHeader('');
   return if !validateInput();
 
@@ -973 +814 @@
       print qq(<div class="center"><div class="heading">The IP $msg has been allocated to customer $webvar{custid}</div></div>);
       # Notify tech@example.com
-      mailNotify('tech@example.com',"ADDED: $disp_alloctypes{$webvar{alloctype}} allocation",
-        "$disp_alloctypes{$webvar{alloctype}} $msg allocated to customer $webvar{custid}\n".
-        "Description: $webvar{desc}\n\nAllocated by: $authuser\n");
+#      mailNotify('tech@example.com',"ADDED: $disp_alloctypes{$webvar{alloctype}} allocation",
+#       "$disp_alloctypes{$webvar{alloctype}} $msg allocated to customer $webvar{custid}\n".
+#       "Description: $webvar{desc}\n\nAllocated by: $authuser\n");
     } else {
       print qq(<div class="center"><div class="heading">The block $webvar{fullcidr} was ).
@@ -981 +822 @@
     }
     syslog "notice", "$authuser allocated '$webvar{fullcidr}' to '$webvar{custid}' as ".
-        "'$webvar{alloctype}'";
+        "'$webvar{alloctype}' ($msg)";
   } else {
     syslog "err", "Allocation of '$webvar{fullcidr}' to '$webvar{custid}' as ".
@@ -1057 +898 @@
 # action=edit
 sub edit {
-  printHeader('');
 
   my $sql;
@@ -1064 +904 @@
   # because I'm lazy, we'll try to make the SELECT's bring out identical)ish) data
   if ($webvar{block} =~ /\/32$/) {
-    $sql = "select ip,custid,type,city,circuitid,description,notes from poolips where ip='$webvar{block}'";
+    $sql = "select ip,custid,type,city,circuitid,description,notes,modifystamp from poolips where ip='$webvar{block}'";
   } else {
-    $sql = "select cidr,custid,type,city,circuitid,description,notes from allocations where cidr='$webvar{block}'"
+    $sql = "select cidr,custid,type,city,circuitid,description,notes,modifystamp from allocations where cidr='$webvar{block}'"
   }
 
@@ -1076 +916 @@
   # Clean up extra whitespace on alloc type
   $data[2] =~ s/\s//;
-
-##fixme LEGACY CODE
-  # Postfix "i" on pool IP types
-  if ($data[2] =~ /^[cdsmw]$/) {
-    $data[2] .= "i";
-  }
 
   open (HTML, "../editDisplay.html")
@@ -1093 +927 @@
 # Needs thinking.  Have to allow changes to city to correct errors, no?
   $html =~ s/\$\$BLOCK\$\$/$webvar{block}/g;
-  $html =~ s/\$\$CITY\$\$/$data[3]/g;
+
+  if ($IPDBacl{$authuser} =~ /c/) {
+    $html =~ s/\$\$CUSTID\$\$/<input type=text name=custid value="$data[1]" maxlength=15 class="regular">/;
 
 # Screw it.  Changing allocation types gets very ugly VERY quickly- especially
@@ -1102 +938 @@
 
 ##fixme The check here should be built from the database
-  if ($data[2] =~ /^.[ne]$/) {
-    # Block that can be changed
-    my $blockoptions = "<select name=alloctype><option".
+    if ($data[2] =~ /^.[ne]$/) {
+      # Block that can be changed
+      my $blockoptions = "<select name=alloctype><option".
         (($data[2] eq 'me') ? ' selected' : '') ." value='me'>Dialup netblock</option>\n<option".
-        (($data[2] eq 'de') ? ' selected' : '') ." value='de'>Dynamic DSL netblock</option>\n<option".  (($data[2] eq 'dc') ? ' selected' : '') ." value='dc'>Dynamic cable netblock</option>\n<option".
-        (($data[2] eq 'ce') ? ' selected' : '') ." value='ce'>Dynamic cable netblock</option>\n<option".        (($data[2] eq 'dc') ? ' selected' : '') ." value='dc'>Dynamic cable netblock</option>\n<option".
-        (($data[2] eq 'we') ? ' selected' : '') ." value='we'>Dynamic wireless netblock</option>\n<option".     (($data[2] eq 'dc') ? ' selected' : '') ." value='dc'>Dynamic cable netblock</option>\n<option".
+        (($data[2] eq 'de') ? ' selected' : '') ." value='de'>Dynamic DSL netblock</option>\n<option".
+        (($data[2] eq 'ce') ? ' selected' : '') ." value='ce'>Dynamic cable netblock</option>\n<option".
+        (($data[2] eq 'we') ? ' selected' : '') ." value='we'>Dynamic wireless netblock</option>\n<option".
         (($data[2] eq 'cn') ? ' selected' : '') ." value='cn'>Customer netblock</option>\n<option".
         (($data[2] eq 'en') ? ' selected' : '') ." value='en'>End-use netblock</option>\n<option".
         (($data[2] eq 'in') ? ' selected' : '') ." value='in'>Internal netblock</option>\n".
         "</select>\n";
-    $html =~ s/\$\$TYPESELECT\$\$/$blockoptions/g;
+      $html =~ s/\$\$TYPESELECT\$\$/$blockoptions/g;
+    } else {
+      $html =~ s/\$\$TYPESELECT\$\$/$disp_alloctypes{$data[2]}<input type=hidden name=alloctype value="$data[2]">/g;
+    }
+    $html =~ s/\$\$CITY\$\$/<input type=text name=city value="$data[3]">/g;
+    $html =~ s/\$\$CIRCID\$\$/<input type="text" name="circid" value="$data[4]" maxlength=64 size=64 class="regular">/g;
+    $html =~ s/\$\$DESC\$\$/<input type="text" name="desc" value="$data[5]" maxlength=64 size=64 class="regular">/g;
+    $html =~ s|\$\$NOTES\$\$|<textarea rows="8" cols="64" name="notes" class="regular">$data[6]</textarea>|g;
   } else {
-    $html =~ s/\$\$TYPESELECT\$\$/$disp_alloctypes{$data[2]}<input type=hidden name=alloctype value="$data[2]">/g;
-  }
-
-  # These can be modified, although CustID changes may get ignored.
-  $html =~ s/\$\$CUSTID\$\$/$data[1]/g;
-  $html =~ s/\$\$TYPE\$\$/$data[2]/g;
-  $html =~ s/\$\$CIRCID\$\$/$data[4]/g;
-  $html =~ s/\$\$DESC\$\$/$data[5]/g;
-  $html =~ s/\$\$NOTES\$\$/$data[6]/g;
+    $html =~ s/\$\$CUSTID\$\$/$data[1]/g;
+    $html =~ s/\$\$TYPESELECT\$\$/$disp_alloctypes{$data[2]}/g;
+    $html =~ s/\$\$CITY\$\$/$data[3]/g;
+    $html =~ s/\$\$CIRCID\$\$/$data[4]/g;
+    $html =~ s/\$\$DESC\$\$/$data[5]/g;
+    $html =~ s/\$\$NOTES\$\$/$data[6]/g;
+  }
+  my ($lastmod,undef) = split /\s+/, $data[7];
+  $html =~ s/\$\$LASTMOD\$\$/$lastmod/g;
+
+  # Allows us to "correctly" colour backgrounds in table
+  my $i=1;
+
+  # More ACL trickery - we can live with forms that don't submit,
+  # but we can't leave the extra table rows there, and we *really*
+  # can't leave the submit buttons there.
+  my $updok = '';
+  if ($IPDBacl{$authuser} =~ /c/) {
+    $updok = qq(<tr class="color$i"><td colspan=2><div class="center">).
+        qq(<input type="submit" value=" Update this block " class="regular">).
+        "</div></td></tr></form>\n";
+    $i++;
+  }
+  $html =~ s/\$\$UPDOK\$\$/$updok/g;
+
+  my $delok = '';
+  if ($IPDBacl{$authuser} =~ /d/) {
+    $delok = qq(<form method="POST" action="main.cgi">
+        <tr class="color$i"><td colspan=2 class="regular"><div class=center>
+        <input type="hidden" name="action" value="delete">
+        <input type="hidden" name="block" value="$webvar{block}">
+        <input type="hidden" name="alloctype" value="$data[2]">
+        <input type=submit value=" Delete this block ">
+        </div></td></tr>);
+  }
+  $html =~ s/\$\$DELOK\$\$/$delok/;
 
   print $html;
@@ -1133 +1003 @@
 # action=update
 sub update {
-  printHeader('');
 
   # Make sure incoming data is in correct format - custID among other things.
-  validateInput;
+  return if !validateInput;
 
   # SQL transaction wrapper
@@ -1143 +1012 @@
     my $sql;
     if (my $pooltype = ($webvar{alloctype} =~ /^(.)i$/) ) {
-      # Note the hack ( available='n' ) to work around "update" additions
-      # to static IP space.  Eww.
       $sql = "update poolips set custid='$webvar{custid}',notes='$webvar{notes}',".
-        "circuitid='$webvar{circid}',description='$webvar{desc}',available='n' ".
+        "circuitid='$webvar{circid}',description='$webvar{desc}',city='$webvar{city}' ".
         "where ip='$webvar{block}'";
     } else {
@@ -1194 +1061 @@
 # Delete an allocation.
 sub remove {
-  printHeader('');
+  if ($IPDBacl{$authuser} !~ /d/) {
+    printError("You shouldn't have been able to get here.  Access denied.");
+    return;
+  }
+
   #show confirm screen.
   open HTML, "../confirmRemove.html"
@@ -1284 +1155 @@
 # Remove IPs from pool listing if necessary
 sub finalDelete {
-  printHeader('');
+  if ($IPDBacl{$authuser} !~ /d/) {
+    printError("You shouldn't have been able to get here.  Access denied.");
+    return;
+  }
 
   my ($code,$msg) = deleteBlock($ip_dbh, $webvar{block}, $webvar{alloctype});
@@ -1292 +1166 @@
     syslog "notice", "$authuser deallocated '$webvar{alloctype}'-type netblock $webvar{block}";
     # Notify tech@ when a block/IP is deallocated
-    mailNotify('tech@example.com',"REMOVED: $disp_alloctypes{$webvar{alloctype}} $webvar{block}",
-        "$disp_alloctypes{$webvar{alloctype}} $webvar{block} deallocated by $authuser\n");
+#    mailNotify('tech@example.com',"REMOVED: $disp_alloctypes{$webvar{alloctype}} $webvar{block}",
+#       "$disp_alloctypes{$webvar{alloctype}} $webvar{block} deallocated by $authuser\n");
   } else {
     if ($webvar{alloctype} =~ /^.i$/) {
@@ -1307 +1181 @@
 
 
+sub exitError {
+  my $errStr = $_[0];
+  printHeader('','');
+  print qq(<center><p class="regular"> $errStr </p>
+<input type="button" value="Back" onclick="history.go(-1)">
+</center>
+);
+  printFooter();
+  exit;
+} # errorExit
+
+
 # Just in case we manage to get here.
 exit 0;

branches/dns/changes.html

@@ -12 +12 @@
 <tr><td class="heading" colspan=2>Changes to the IPDB</td><tr>
 
+<tr class="color2">
+<td valign=top>03/10/2005</td>
+<td>Finally!  Support for "container"/"reserve" netblocks to make tracking superblocks like
+209.91.191.0/24 easier.  Also supports "dynamically routed DSL netblocks";  ie,
+netblock-aligned chunks of static DSL IPs with netblock-ish subnet masks such as
+209.91.186.0/25.
+</td></tr>
+<tr class="color1">
+<td valign=top>02/09/2005</td>
+<td>Pool handling has been cleaned up - all PPP-ish pools (modem, DSL, WiFi) now generate a
+full list of IPs rather than reserving the network, gateway, and broadcast IPs necessary on
+a "real" subnet.  They will also not display this incorrect and useless information.
+</td></tr>
 <tr class="color2">
 <td valign=top>01/27/2005</td>

branches/dns/editDisplay.html

@@ -8 +8 @@
 <tr class="color1"><td class=heading>IP block:</td><td class="regular">$$BLOCK$$</td></tr>
 
-<tr class="color2"><td class=heading>City:</td><td class="regular">
-<input type=text name=city value="$$CITY$$"></td></tr>
+<tr class="color2"><td class=heading>City:</td><td class="regular">$$CITY$$</td></tr>
 
 <tr class="color1"><td class=heading>Type:</td><td class=regular>$$TYPESELECT$$</td></tr>
 
-<tr class="color2"><td class=heading>CustID:</td><td class="regular">
-<input type=text name=custid value="$$CUSTID$$" maxlength=15 class="regular"></td></tr>
+<tr class="color2"><td class=heading>CustID:</td><td class="regular">$$CUSTID$$</td></tr>
 
-<tr class="color1"><td class="heading">Circuit ID:</td><td class="regular">
-<input type="text" name="circid" value="$$CIRCID$$" maxlength=64 size=64 class="regular"></td></tr>
+<tr class="color1"><td class=heading>Last modified:</td><td class=regular>$$LASTMOD$$</td></tr>
 
-<tr class="color2"><td class="heading">Description/Name:</td><td class="regular">
-<input type="text" name="desc" value="$$DESC$$" maxlength=64 size=64 class="regular"></td></tr>
+<tr class="color2"><td class="heading">Circuit ID:</td><td class="regular">$$CIRCID$$</td></tr>
 
-<tr class="color1"><td class="heading" valign="top">Notes:</td><td class="regular">
-<textarea rows="8" cols="64" name="notes" class="regular">$$NOTES$$</textarea></td></tr>
+<tr class="color1"><td class="heading">Description/Name:</td><td class="regular">$$DESC$$</td></tr>
 
-<tr class="color2"><td colspan=2 class=regular><div class="center">
-<input type="submit" value=" Update this block " class="regular">
-</div></td></tr></form>
-<form method="POST" action="main.cgi">
-<tr class="color1"><td colspan=2 class="regular"><div class=center>
-<input type="hidden" name="action" value="delete">
-<input type="hidden" name="block" value="$$BLOCK$$">
-<input type="hidden" name="alloctype" value="$$TYPE$$">
-<input type=submit value=" Delete this block ">
-</div></td></tr>
+<tr class="color2"><td class="heading" valign="top">Notes:</td><td class="regular">$$NOTES$$</td></tr>
+
+$$UPDOK$$
+$$DELOK$$
 </form>
 

branches/dns/header.inc

@@ -40 +40 @@
 <tr class="color1">
 <td width=10></td>
-<form method="POST" action="/ip/cgi-bin/main.cgi">
-<td>Search:
+<form method="POST" action="/ip/cgi-bin/search.cgi">
+<td width=390>Quick Search:
 <input type="text" name="input" size="20" maxlength="50" class="regular">
-<input type=radio name="searchfor" value="ipblock">IP/IP block
-<input type=radio name="searchfor" value="desc" checked=yes>Description
-<input type=radio name="searchfor" value="cust">Customer ID
 <input type=hidden name=page value="1">
-<input type=hidden name=action value="search">
+<input type=hidden name=stype value="q">
 <input type=submit value="Go!" class="heading">
 <input type="button" value=" Help? " onclick="openHelp()" class="regular">
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-<a href="/ip/cgi-bin/main.cgi?action=assign">Add new assignment</a>
-</td>
+</td><td width=10></td><td><a href="/ip/cgi-bin/search.cgi">Complex Search</a></td>
+<td width=60></td>
+$$EXTRA0$$
 </form>
 </tr>

branches/dns/help.html

@@ -11 +11 @@
 <table class="regular">
 
-<tr><td class="heading">Searches:</td><tr>
+<tr><td class="heading">Quick Searches:</td><tr>
 
 <tr class="color1">

branches/dns/index.shtml

@@ -1 @@
-<!--#include file="header.inc"-->
 <!--#include virtual="/ip/cgi-bin/main.cgi?action=index" -->