Changeset 128 for trunk

Timestamp:

09/21/11 18:13:16 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Code review/cleanup

• Move configuration of DB host, user, pass, name into an outside file.
• Fail more gracefully on DB connection failure. Includes minor CSS tweak that probably doesn't really do what I think it's doing.

Location:

trunk

Files:

• DNSDB.pm (modified) (5 diffs)
• dns.cgi (modified) (1 diff)
• templates/dberr.tmpl (added)
• templates/dns.css (modified) (1 diff)

trunk/DNSDB.pm

@@ -28 +28 @@
         &initPermissions &getPermissions &changePermissions &comparePermissions
         &changeGroup
-        &connectDB &finish
+        &loadConfig &connectDB &finish
         &addDomain &delDomain &domainName &domainID
         &addGroup &delGroup &getChildren &groupName
@@ -38 +38 @@
         &domStatus &importAXFR
         &export
-        %typemap %reverse_typemap
+        %typemap %reverse_typemap %config
         %permissions @permtypes $permlist
         );
@@ -47 +47 @@
                 &initPermissions &getPermissions &changePermissions &comparePermissions
                 &changeGroup
-                &connectDB &finish
+                &loadConfig &connectDB &finish
                 &addDomain &delDomain &domainName &domainID
                 &addGroup &delGroup &getChildren &groupName
@@ -57 +57 @@
                 &domStatus &importAXFR
                 &export
-                %typemap %reverse_typemap
+                %typemap %reverse_typemap %config
                 %permissions @permtypes $permlist
                 )]
@@ -97 +97 @@
 our %permissions;
 
+# Prepopulate a basic config.  Note some of these *will* cause errors if left unset.
+our %config = (
+                # Database connection info
+                dbname  => 'dnsdb',
+                dbuser  => 'dnsdb',
+                dbpass  => 'secret',
+                dbhost  => '',
+
+                # Email notice settings
+                mailhost        => 'smtp.example.com',
+                mailsender      => 'dnsdb@example.com',
+                mailname        => 'DNS Administration',
+
+                # Template directory
+                templatedir     => 'templates/',
+# fmeh.  this is a real web path, not a logical internal one.  hm..
+#               cssdir  => 'templates/';
+        );
+
+
 ##
 ## Initialization and cleanup subs
 ##
+
+
+## DNSDB::loadConfig()
+# 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
+# Populates the %config and %def hashes
+sub loadConfig {
+  my $basename = shift || '';   # this will work OK
+
+  my $deferr = '';      # place to put error from default config file in case we can't find either one
+
+  my $configroot = '/etc/dnsdb';
+  $configroot = '' if $basename =~ m|^/|;
+  $basename .= ".conf" if $basename !~ /\.conf$/;
+  my $defconfig = "$configroot/dnsdb.conf";
+  my $siteconfig = "$configroot/$basename";
+
+  # System defaults
+  __cfgload("$configroot/dnsdb.conf") or $deferr = $errstr;
+
+  # Per-site-ish settings
+  unless (__cfgload("$configroot/$basename")) {
+    $errstr = ($deferr ? "Error opening default config file $defconfig: $deferr\n" : '').
+        "Error opening site config file $siteconfig";
+    return;
+  }
+
+  # All good, clear the error and go home.
+  $errstr = '';
+  return 1;
+} # end loadConfig()
+
+
+## DNSDB::__cfgload()
+# Private sub to parse a config file and load it into %config
+# Takes a file handle on an open config file
+sub __cfgload {
+  $errstr = '';
+  my $cfgfile = shift;
+  if (open CFG, "<$cfgfile") {
+#  my $mode = '';
+    while (<CFG>) {
+      chomp;
+      s/^\s*//;
+      next if /^#/;
+      next if /^$/;
+# hmm.  more complex bits in this file might require [heading] headers, maybe?
+#    $mode = $1 if /^\[(a-z)+]/;
+    # DB connect info
+      $config{dbname}   = $1 if /^dbname\s*=\s*([a-z0-9_.-]+)/i;
+      $config{dbuser}   = $1 if /^dbuser\s*=\s*([a-z0-9_.-]+)/i;
+      $config{dbpass}   = $1 if /^dbpass\s*=\s*([a-z0-9_.-]+)/i;
+      $config{dbhost}   = $1 if /^dbhost\s*=\s*([a-z0-9_.-]+)/i;
+      # SOA defaults
+      $def{contact}     = $1 if /^contact\s*=\s*([a-z0-9_.-]+)/i;
+      $def{prins}       = $1 if /^prins\s*=\s*([a-z0-9_.-]+)/i;
+      $def{soattl}      = $1 if /^soattl\s*=\s*([a-z0-9_.-]+)/i;
+      $def{refresh}     = $1 if /^refresh\s*=\s*([a-z0-9_.-]+)/i;
+      $def{retry}       = $1 if /^retry\s*=\s*([a-z0-9_.-]+)/i;
+      $def{expire}      = $1 if /^expire\s*=\s*([a-z0-9_.-]+)/i;
+      $def{minttl}      = $1 if /^minttl\s*=\s*([a-z0-9_.-]+)/i;
+      $def{ttl}         = $1 if /^ttl\s*=\s*([a-z0-9_.-]+)/i;
+      # Mail settings
+      $config{mailhost}         = $1 if /^mailhost\s*=\s*([a-z0-9_.-]+)/i;
+      $config{mailsender}       = $1 if /^mailsender\s*=\s*([a-z0-9_.@-]+)/i;
+      $config{mailname}         = $1 if /^mailname\s*=\s*([a-z0-9\s_.-]+)/i;
+    }
+    close CFG;
+  } else {
+    $errstr = $!;
+    return;
+  }
+  return 1;
+} # end __cfgload()
 
 

trunk/dns.cgi

@@ -130 +130 @@
 my $sortorder = "ASC";
 
-#my ($dbh,$msg) = connectDB("dnsdb","dnsdb","secret","newdbhost");
+# now load some local system defaults (mainly DB connect info)
+# note this is not *absolutely* fatal, since there's a default dbname/user/pass in DNSDB.pm
+# we'll catch a bad DB connect string a little further down.
+if (!loadConfig()) {
+  warn "Using default configuration;  unable to load custom settings: $DNSDB::errstr";
+}
+
+##fixme: quit throwing the database handle around, and put all the SQL and direct DB fiddling into DNSDB.pm
 # dbname, user, pass, host (optional)
-my ($dbh,$msg) = connectDB("dnsdb", "dnsdb", "secret", "dnsdbhost");
-#my $dbh = DBI->connect("DBI:mysql:database=vegadns","vegadns","secret",
-#       { AutoCommit => 0 }) or die $DBI::errstr;
-
-##fixme.  PLEASE!  <G>
-print $msg if !$dbh;
-
-# fiddle hardcoded "defaults" as per system/user (?) prefs
+my ($dbh,$msg) = connectDB($config{dbname}, $config{dbuser}, $config{dbpass}, $config{dbhost});
+
+if (!$dbh) {
+  print "Content-type: text/html\n\n";
+  print $header->output;
+  my $errpage = HTML::Template->new(filename => "$templatedir/dberr.tmpl");
+  $errpage->param(errmsg => $msg);
+  print $errpage->output;
+  print $footer->output;
+  exit;
+}
+
+# Load config pieces from the database.  Ideally all but the DB user/pass/etc should be loaded here.
 initGlobals($dbh);
 

trunk/templates/dns.css

@@ -181 +181 @@
         text-align: center;
 }
+/* not sure this really does what I think it does.  is it really not
+   possible to center an arbitrary <blah> in some other arbitrary <foo>? */
+.loccenter {
+        margin-left: 10%;
+        margin-right: 10%;
+}
 .maintitle {
         font-size: 1.3em;