Changeset 508 for branches

Timestamp:

11/16/11 16:28:37 (12 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Prep-for-release cleanup of buglets found making sure the demo
install works

• Clean up instructions for creating the database. Apparently the PL/pgSQL "language" module required for the last-modified triggers can't be installed by a regular user, and isn't available by default. O_o
• Fix a missed $IPDB::webpath-in-single-quotes
• Add a quick hack to allow automagical allocation from private net ranges. See #38.
• Partially convert some critical bits to use bound parameters in SQL for new allocations. See #34, mostly cleaned up already on /trunk or /branches/htmlform
• Set $privdata = internally so that an allocation via admin tools doesn't error out

Location:

branches/stable

Files:

• INSTALL (modified) (1 diff)
• assign.html (modified) (1 diff)
• cgi-bin/IPDB.pm (modified) (4 diffs)
• cgi-bin/MyIPDB.pm (modified) (1 diff)
• cgi-bin/main.cgi (modified) (3 diffs)

branches/stable/INSTALL

@@ -61 +61 @@
   b) Edit CustIDCK.pm as needed to validate customer IDs.
 
-4) As a Postgres superuser, create a database user and the database.
-Create the inital tables using cgi-bin/ipdb.psql.
+4) As a Postgres superuser, create a database user and the database:
+
+shell> psql template1
+pg# create user ipdb with password "ipdbpwd";
+pg# create database ipdb owner ipdb;
+
+Add the PL/pgSQL language to the database.  This is not strictly
+necessary but there are triggers on the poolips and allocations table
+to automatically update a last-modified column.
+
+pg# \c ipdb
+pg# create language plpgsql
+
+Create the inital tables using cgi-bin/ipdb.psql:
+
+shell> psql -U ipdb ipdb <cgi-bin/ipdb.psql
 
 5) Configure your webserver to call the IPDB scripts at an appropriate 

branches/stable/assign.html

@@ -37 +37 @@
 <tr class="color2">
 <td>Route/allocate from this master:&nbsp;</td><td>$$MASTERLIST$$
-Allow automatic allocation from private IP ranges:<input type=checkbox name=allowpriv>
+Allow automatic allocation from private IP ranges:<input type=checkbox $$ALLOWPRIV$$ name=allowpriv>
 </td>
 </tr><tr class="color1">

branches/stable/cgi-bin/IPDB.pm

@@ -72 +72 @@
 our $syslog_facility = 'local2';
 
+# Allow allocations to come from private IP ranges by default?
+# Set to 'y' or 'on' to enable.
+our $allowprivrange = '';
+
 # Let's initialize the globals.
 ## IPDB::initIPDBGlobals()
@@ -312 +316 @@
 sub allocateBlock {
   my ($dbh,undef,undef,$custid,$type,$city,$desc,$notes,$circid,$privdata,$nodeid) = @_;
+  $privdata = '' if !defined($privdata);
 
   my $cidr = new NetAddr::IP $_[1];
@@ -399 +404 @@
           $sth = $dbh->prepare("insert into allocations".
                 " (cidr,custid,type,city,description,notes,maskbits,circuitid,privdata)".
-                " values ('$cidr','$custid','$type','$city','$desc','$notes',".
-                $cidr->masklen.",'$circid','$privdata')");
-          $sth->execute;
+                " values ('$cidr','$custid','$type','$city',?,?,".
+                $cidr->masklen.",?,?)");
+          $sth->execute($desc,$notes,$circid,$privdata);
 
           # And initialize the pool, if necessary
@@ -509 +514 @@
           $sth = $dbh->prepare("insert into allocations (cidr,custid,type,city,".
                 "description,notes,maskbits,circuitid,privdata)".
-                " values ('$cidr','$custid','$type','$city','$desc','$notes',".
-                $cidr->masklen.",'$circid','$privdata')");
-          $sth->execute;
+                " values ('$cidr','$custid','$type','$city',?,?,".
+                $cidr->masklen.",?,?)");
+          $sth->execute($desc,$notes,$circid,$privdata);
 
           # And initialize the pool, if necessary

branches/stable/cgi-bin/MyIPDB.pm

@@ -51 +51 @@
 #$IPDB::syslog_facility = 'daemon';
 
+# Allow allocations to come from private IP ranges by default?
+# Set to 'y' or 'on' to enable.
+#$IPDB::allowprivrange = '';
 
 ## connectDB_My()

branches/stable/cgi-bin/main.cgi

@@ -446 +446 @@
     # If the allocation is a pool, allow listing of the IPs in the pool.
     if ($data[2] =~ /^.[pd]$/) {
-      $row[0] .= ' &nbsp; <a href="$IPDB::webpath/cgi-bin/main.cgi?action=listpool'.
+      $row[0] .= qq( &nbsp; <a href="$IPDB::webpath/cgi-bin/main.cgi?action=listpool).
         "&pool=$data[0]\">List IPs</a>";
     }
@@ -583 +583 @@
 
     $html =~ s|\$\$WEBPATH\$\$|$IPDB::webpath|g;
+    if ($IPDB::allowprivrange eq 'y' or $IPDB::allowprivrange eq 'on') {
+      $html =~ s/\$\$ALLOWPRIV\$\$/checked=checked/;
+    } else {
+      $html =~ s/\$\$ALLOWPRIV\$\$//;
+    }
 
     # This is a little dangerous, as it's *theoretically* possible to
@@ -614 +619 @@
     close HTML;
     $html =~ s|\$\$WEBPATH\$\$|$IPDB::webpath|g;
+    if ($IPDB::allowprivrange eq 'y' or $IPDB::allowprivrange eq 'on') {
+      $html =~ s/\$\$ALLOWPRIV\$\$/checked=checked/;
+    } else {
+      $html =~ s/\$\$ALLOWPRIV\$\$//;
+    }
     my $masterlist = "<select name=allocfrom><option selected>-</option>\n";
     foreach my $master (@masterblocks) {