Changeset 660

Timestamp:

12/29/14 17:46:43 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Backmerge addition of RPC shim from /branches/stable r600

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 (copied) (copied from branches/stable/cgi-bin/ipdb-rpc.cgi )

trunk/cgi-bin/IPDB.pm

@@ -25 +25 @@
 @EXPORT_OK    = qw(
         %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist
-        %IPDBacl %aclmsg $errstr
+        %IPDBacl %aclmsg %rpcacl
+        $errstr
         &initIPDBGlobals &connectDB &finish &checkDBSanity
         &addMaster &touchMaster
@@ -39 +40 @@
 %EXPORT_TAGS    = ( ALL => [qw(
                 %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist
-                %IPDBacl %aclmsg $errstr
+                %IPDBacl %aclmsg %rpcacl
+                $errstr
                 &initIPDBGlobals &connectDB &finish &checkDBSanity
                 &addMaster &touchMaster
@@ -68 +70 @@
         delblock        => 'delete an allocation',
         );
+
+our %rpcacl;
 
 # error reporting

trunk/cgi-bin/MyIPDB.pm

@@ -23 +23 @@
 my $dbhost = 'localhost';
 
-# Quick workaround for fixed web path.  Set this to the absolute web path to 
-# your IPDB install, or leave blank for installation at the webroot. 
-$IPDB::webpath = ''; 
+# ACL for RPC shim.  A hash of arrays;  the hash keys are the remote system
+# names, the array contents are the IPs allowed to claim that system name.
+#%IPDB::rpcacl = (
+#       cli_test => ['192.168.99.115','209.91.179.62'],
+#       devel => ['10.0.10.5'],
+#       );
+
+# Quick workaround for fixed web path.  Set this to the absolute web path to
+# your IPDB install, or leave blank for installation at the webroot.
+$IPDB::webpath = '';
 
 # Set some globals declared in IPDB.pm.  Most of these only affect mailNotify().