Changeset 400 for trunk

Timestamp:

05/11/10 17:06:26 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge addition of CustIDCK.pm from r56 - proprietary info this contained
was stripped during repo history conversion and it makes a good base for
providing data validation hooks.
Also merge all updates and related additions since.
See #13.

Location:

trunk/cgi-bin

Files:

• CustIDCK.pm (copied) (copied from branches/stable/cgi-bin/CustIDCK.pm )
• admin.cgi (modified) (3 diffs)
• checkcusts.pl (copied) (copied from branches/stable/cgi-bin/checkcusts.pl ) (3 diffs)
• main.cgi (modified) (3 diffs)

trunk/cgi-bin/admin.cgi

@@ -18 +18 @@
 use CommonWeb qw(:ALL);
 use MyIPDB;
+use CustIDCK;
 #use POSIX qw(ceil);
 use NetAddr::IP;
@@ -134 +135 @@
   my $custid = $data[0];
   if ($custid eq '') {
+    if ($webvar{custid} !~ /^(?:\d{10}|\d{7}|STAFF)(?:-\d\d?)?$/) {
+      # Force uppercase for now...
+      $webvar{custid} =~ tr/a-z/A-Z/;
+      # Crosscheck with billing.
+      my $status = CustIDCK->custid_exist($webvar{custid});
+      if ($CustIDCK::Error) {
+        printError("Error verifying customer ID: ".$CustIDCK::ErrMsg);
+        return;
+      }
+      if (!$status) {
+        printError("Customer ID not valid.  Make sure the Customer ID ".
+          "is correct.<br>\nUse STAFF for staff static IPs, and 6750400 for any other ".
+          "non-customer assignments.");
+        return;
+      }
+    }
     # Type that doesn't have a default custid
     $custid = $webvar{custid};
   }
-##fixme Check billing DB here
 
   my $cidr = new NetAddr::IP $webvar{cidr};
@@ -506 +522 @@
 #
 
+print qq(<hr><a href="/ip/">Back</a> to main interface</a>\n);
 
 printFooter;

trunk/cgi-bin/checkcusts.pl

@@ -7 +7 @@
 # Last update by $Author$
 ###
-# Copyright (C) 2004 Kris Deugau <kdeugau@vianet.ca>
+# Copyright (C) 2004-2006 Kris Deugau
 
 use DBI;
-use IPDB qw(:ALL);
+use IPDB 2.0 qw(:ALL);
 
 # We'll be hosing the server with several thousand queries.  We
@@ -25 +25 @@
 print "Content-type: text/plain\n\n";
 
-$dbh = connectDB;
+($dbh,$errstr) = connectDB("ipdb", "ipdb", "ipdbpwd");
 $IDH = DBI->connect ("DBI:Pg:host=billing;dbname=custids", "cidcheck", "c1dch4ck");
+
+$sth = $dbh->prepare("select distinct def_custid from alloctypes where listorder >=40");
+$sth->execute;
+while (@data = $sth->fetchrow_array) {
+  push @def_custids, $data[0];
+}
 $sth = $dbh->prepare("select cidr,custid from searchme where not (custid='6750400') ".
         "and not (custid='STAFF') order by cidr");
+#$sth = $dbh->prepare("select cidr,custid from searchme order by cidr");
 $sth->execute;
 
@@ -35 +42 @@
 $count = $bad = 0;
 while (@data = $sth->fetchrow_array) {
-  $count++;
   $cidr = new NetAddr::IP $data[0];
-  if ($cidr->within($priv1) or $cidr->within($priv2) or $cidr->within($priv3)) {
+  if ($cidr->within($priv1) or $cidr->within($priv2) or $cidr->within($priv3) or
+        (grep /$data[1]/, @def_custids)) {
     # no-op.  we ignore these.
   } else {
+    $count++;
     $IDS->execute($data[1]);
     $hr = $IDS->fetchrow_hashref();

trunk/cgi-bin/main.cgi

@@ -15 +15 @@
 use CommonWeb qw(:ALL);
 use MyIPDB;
+use CustIDCK;
 use POSIX qw(ceil);
 use NetAddr::IP;
@@ -943 +944 @@
       return;
     }
-    if ($webvar{custid} !~ /^(?:\d{5,10}|STAFF|TEMP)(?:-\d\d?)?$/) {
-      printError("Please enter a valid customer ID- this must be a 7- or 10-digit number, or STAFF for static IPs for staff.");
-      return;
-    }
-    print "<!-- [ In validateInput().  Insert customer ID cross-check here. ] -->\n";
+    if ($webvar{custid} !~ /^(?:\d{10}|\d{7}|STAFF)(?:-\d\d?)?$/) {
+      # Force uppercase for now...
+      $webvar{custid} =~ tr/a-z/A-Z/;
+      # Crosscheck with billing.
+      my $status = CustIDCK->custid_exist($webvar{custid});
+      if ($CustIDCK::Error) {
+        printError("Error verifying customer ID: ".$CustIDCK::ErrMsg);
+        return;
+      }
+      if (!$status) {
+        printError("Customer ID not valid.  Make sure the Customer ID ".
+          "is correct.<br>\nUse STAFF for staff static IPs, and 6750400 for any other ".
+          "non-customer assignments.");
+        return;
+      }
+#"Please enter a valid customer ID- this must be a 7- or 10-digit number, or STAFF for
+#static IPs for staff.");
+    }
+#    print "<!-- [ In validateInput().  Insert customer ID cross-check here. ] -->\n";
   } else {
     # New!  Improved!  And now Loaded From The Database!!
@@ -967 +982 @@
   } else {
     $flag = 'n';
-    if ($webvar{alloctype} =~ /[wp][cr]|d[pi]/) {
+    if ($webvar{alloctype} =~ /[wp][cr]|[ds][pi]/) {
       # Set this forcibly rather than messing around elsewhere.  Yes, this *is* a hack.  PTHBTT!!
-      # Match CORE/WAN types (wc, wr, pc, pr), DSL pool and IP (dp, di).
-      $webvar{pop} = "Sudbury";
-    } elsif ($webvar{pop} =~ /^-$/) {
+      $webvar{pop} = 'Sudbury';
+    }
+    if ($webvar{pop} =~ /^-$/) {
       $flag = 'to route the block from/through';
     }