Changeset 400 for trunk

Timestamp:

10/03/12 18:02:56 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Normalize calling convention in loadConfig() and cfgload() to
prepare for updates in dns-rpc.cgi. (Good thing nothing else
has needed to pass any arguments to it yet.)
Extend configuration parser to support rpc* options such as rpc_iplist
to restrict which IPs can make RPC calls for which calling serivce.
See #43.

File:

• trunk/DNSDB.pm (modified) (3 diffs)

trunk/DNSDB.pm

@@ -1198 +1198 @@
 # Load the minimum required initial state (DB connect info) from a config file
 # Load misc other bits while we're at it.
-# Takes an optional basename and config path to look for
+# Takes an optional hash that may contain:
+#  - basename and config path to look for
+#  - RPC flag (saves parsing the more complex RPC bits if not needed)
 # Populates the %config and %def hashes
 sub loadConfig {
-  my $basename = shift || '';   # this will work OK
-##fixme  $basename isn't doing what I think I thought I was trying to do.
+  my %args = @_;
+  $args{basename} = '' if !$args{basename};
+  $args{rpcflag} = '' if !$args{rpcflag};
+##fixme  $args{basename} isn't doing what I think I thought I was trying to do.
 
   my $deferr = '';      # place to put error from default config file in case we can't find either one
 
   my $configroot = "/etc/dnsdb";        ##CFG_LEAF##
-  $configroot = '' if $basename =~ m|^/|;
-  $basename .= ".conf" if $basename !~ /\.conf$/;
+  $configroot = '' if $args{basename} =~ m|^/|;
+  $args{basename} .= ".conf" if $args{basename} !~ /\.conf$/;
   my $defconfig = "$configroot/dnsdb.conf";
-  my $siteconfig = "$configroot/$basename";
+  my $siteconfig = "$configroot/$args{basename}";
 
   # System defaults
-  __cfgload("$defconfig") or $deferr = $errstr;
+  __cfgload("$defconfig", $args{rpcflag}) or $deferr = $errstr;
 
   # Per-site-ish settings.
-  if ($basename ne '.conf') {
-    unless (__cfgload("$siteconfig")) {
+  if ($args{basename} ne '.conf') {
+    unless (__cfgload("$siteconfig"), $args{rpcflag}) {
       $errstr = ($deferr ? "Error opening default config file $defconfig: $deferr\n" : '').
         "Error opening site config file $siteconfig";
@@ -1253 +1257 @@
   $errstr = '';
   my $cfgfile = shift;
+  my $rpcflag = shift;
 
   if (open CFG, "<$cfgfile") {
@@ -1290 +1295 @@
       $config{perpage}          = $1 if /^perpage\s*=\s*(\d+)/i;
       $config{exportcache}      = $1 if m{^exportcache\s*=\s*([a-z0-9/_.-]+)}i;
+      # RPC options
+      if ($rpcflag && /^rpc/) {
+        if (my ($tmp) = /^rpc_iplist\s*=\s*(.+)/i) {
+          my @ips = split /[,\s]+/, $tmp;
+          my $rpcsys = shift @ips;
+          push @{$config{rpcacl}{$rpcsys}}, @ips;
+        }
+      }
     }
     close CFG;