Changeset 661 for trunk

Timestamp:

12/29/14 17:52:03 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Backmerge minor RPC fixes from /branches/stable r610

Location:

trunk

Files:

• . (modified) (1 prop)
• cgi-bin/IPDB.pm (modified) (3 diffs)
• cgi-bin/MyIPDB.pm (modified) (1 diff)
• cgi-bin/ipdb-rpc.cgi (modified) (4 diffs, 1 prop)

trunk/cgi-bin/IPDB.pm

@@ -25 +25 @@
 @EXPORT_OK    = qw(
         %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist
-        %IPDBacl %aclmsg %rpcacl
+        %IPDBacl %aclmsg %rpcacl $maxfcgi
         $errstr
         &initIPDBGlobals &connectDB &finish &checkDBSanity
@@ -40 +40 @@
 %EXPORT_TAGS    = ( ALL => [qw(
                 %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist
-                %IPDBacl %aclmsg %rpcacl
+                %IPDBacl %aclmsg %rpcacl $maxfcgi
                 $errstr
                 &initIPDBGlobals &connectDB &finish &checkDBSanity
@@ -72 +72 @@
 
 our %rpcacl;
+our $maxfcgi = 3;
 
 # error reporting

trunk/cgi-bin/MyIPDB.pm

@@ -29 +29 @@
 #       devel => ['10.0.10.5'],
 #       );
+# Only you can prevent memory leaks!
+#$IPDB::maxfcgi = 100;
 
 # Quick workaround for fixed web path.  Set this to the absolute web path to

trunk/cgi-bin/ipdb-rpc.cgi

@@ -37 +37 @@
 }
 
-syslog "debug", "$authuser active, $ENV{'REMOTE_ADDR'}";
-
 # Why not a global DB handle?  (And a global statement handle, as well...)
 # Use the connectDB function, otherwise we end up confusing ourselves
@@ -57 +55 @@
 # main FCGI loop.
 while (FCGI::accept >= 0) {
+  # done here to a) prevent $ENV{'REMOTE_ADDR'} from being empty and b) to collect
+  # the right user for the individual call (since we may be running with FCGI)
+  syslog "debug", "$authuser active, $ENV{'REMOTE_ADDR'}";
+
   # don't *think* we need any of these...
   # %disp_alloctypes, %def_custids, %list_alloctypes
@@ -74 +76 @@
     print $res->answer;
   }
-#  last if $reqcnt++ > $IPDB::maxfcgi;
+  last if $reqcnt++ > $IPDB::maxfcgi;
 } # while FCGI::accept
 
@@ -87 +89 @@
 sub _aclcheck {
   my $subsys = shift;
-  return 1;
-  return 1 if grep /$ENV{REMOTE_ADDR}/, $IPDB::rpcacl{$subsys};
+  return 1 if grep /$ENV{REMOTE_ADDR}/, @{$IPDB::rpcacl{$subsys}};
   warn "$subsys/$ENV{REMOTE_ADDR} not in ACL\n";        # a bit of logging
   return 0;