Changeset 468 for trunk

Timestamp:

03/12/13 13:39:49 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Object conversion of DNSDB.pm, 4 of <mumble>. See #11.

• Convert initialization of bundled callers to object calls

Location:

trunk

Files:

• dns-rpc.cgi (modified) (2 diffs)
• dns.cgi (modified) (9 diffs)
• export.pl (modified) (1 diff)
• textrecs.cgi (modified) (2 diffs)
• tiny-import.pl (modified) (14 diffs)
• vega-import.pl (modified) (2 diffs)

trunk/dns-rpc.cgi

@@ -39 +39 @@
 #package main;
 
-DNSDB::loadConfig(rpcflag => 1);
-
-# need to create a DNSDB object too
-my ($dbh,$msg) = DNSDB::connectDB($DNSDB::config{dbname}, $DNSDB::config{dbuser},
-        $DNSDB::config{dbpass}, $DNSDB::config{dbhost});
-
-DNSDB::initGlobals($dbh);
+my $dnsdb = DNSDB->new();
 
 my $methods = {
@@ -80 +74 @@
 
 # "Can't do that" errors
-if (!$dbh) {
+if (!$dnsdb) {
   print "Content-type: text/xml\n\n".$res->{_decode}->encode_fault(5, $msg);
   exit;

trunk/dns.cgi

@@ -45 +45 @@
 use lib '.';    ##uselib##
 
-use DNSDB qw(:ALL);
+use DNSDB;
 
 my @debugbits;  # temp, to be spit out near the end of processing
@@ -69 +69 @@
 # we'll catch a bad DB connect string once we get to trying that
 ##fixme:  pass params to loadConfig, and use them there, to allow one codebase to support multiple sites
-if (!loadConfig()) {
-  warn "Using default configuration;  unable to load custom settings: $DNSDB::errstr";
+my $dnsdb = new DNSDB;
+
+my $header = HTML::Template->new(filename => "$templatedir/header.tmpl");
+my $footer = HTML::Template->new(filename => "$templatedir/footer.tmpl");
+$footer->param(version => $DNSDB::VERSION);
+
+if (!$dnsdb) {
+  print "Content-type: text/html\n\n";
+  print $header->output;
+  my $errpage = HTML::Template->new(filename => "$templatedir/dberr.tmpl");
+  $errpage->param(errmsg => $DNSDB::errstr);
+  print $errpage->output;
+  print $footer->output;
+  exit;
 }
+
+$header->param(orgname => $dnsdb->{orgname}) if $dnsdb->{orgname} ne 'Example Corp';
 
 # persistent stuff needed on most/all pages
 my $sid = ($webvar{sid} ? $webvar{sid} : undef);
-my $session = new CGI::Session("driver:File", $sid, {Directory => $config{sessiondir}})
+my $session = new CGI::Session("driver:File", $sid, {Directory => $dnsdb->{sessiondir}})
         or die CGI::Session->errstr();
 #$sid = $session->id() if !$sid;
@@ -81 +95 @@
   # init stuff.  can probably axe this down to just above if'n'when user manipulation happens
   $sid = $session->id();
-  $session->expire($config{timeout});
+  $session->expire($dnsdb->{timeout});
 # need to know the "upper" group the user can deal with;  may as well
 # stick this in the session rather than calling out to the DB every time.
@@ -149 +163 @@
 push @filterargs, $filter if $filter;
 
-# nrgh, can't handle login here because we don't have a database handle to check the user/pass with yet
-
-my $header = HTML::Template->new(filename => "$templatedir/header.tmpl");
-my $footer = HTML::Template->new(filename => "$templatedir/footer.tmpl");
-$header->param(orgname => $config{orgname}) if $config{orgname} ne 'Example Corp';
-$footer->param(version => $DNSDB::VERSION);
-
 ## set up "URL to self"
 # @#$%@%@#% XHTML - & in a URL must be escaped.  >:(
@@ -179 +186 @@
 # pagination
 my $perpage = 15;
-$perpage = $config{perpage} if $config{perpage};
+$perpage = $dnsdb->{perpage} if $dnsdb->{perpage};
 my $offset = ($webvar{offset} ? $webvar{offset} : 0);
 
@@ -186 +193 @@
 my $sortorder = "ASC";
 
-##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($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);
-
 # security check - does the user have permission to view this entity?
 # this is a prep step used "many" places
 my @viewablegroups;
-getChildren($dbh, $logingroup, \@viewablegroups, 'all');
+$dnsdb->getChildren($logingroup, \@viewablegroups, 'all');
 push @viewablegroups, $logingroup;
 
@@ -232 +222 @@
     # Snag ACL/permissions here too
 
-    my $userdata = login($dbh, $webvar{username}, $webvar{password});
+    my $userdata = $dnsdb->login($webvar{username}, $webvar{password});
 
     if ($userdata) {
@@ -293 +283 @@
 # but if they keep the session active they'll continue to have access long after being disabled.  :/
 # Treat it as a session expiry.
-if ($session->param('uid') && !userStatus($dbh, $session->param('uid')) ) {
+if ($session->param('uid') && !$dnsdb->userStatus($session->param('uid')) ) {
   $sid = '';
   $session->delete;     # force expiry of the session Right Away
@@ -301 +291 @@
 
 # Misc Things To Do on most pages
-initPermissions($dbh, $session->param('uid'));
-initActionLog($dbh, $session->param('uid'));
+$dnsdb->initPermissions($session->param('uid'));
+$dnsdb->initActionLog($session->param('uid'));
 
 $page->param(sid => $sid) unless $webvar{page} eq 'login';      # no session ID on the login page

trunk/export.pl

@@ -25 +25 @@
 use lib '.';    ##uselib##
 
-use DNSDB qw(:ALL);
+use DNSDB;
 
-loadConfig();
+my $dnsdb = new DNSDB;
 
 open TINYDATA, ">tinydata";
 
-my ($dbh,$msg) = connectDB($config{dbname}, $config{dbuser}, $config{dbpass}, $config{dbhost});
-initGlobals($dbh);
-
 export($dbh,'tiny',*TINYDATA);

trunk/textrecs.cgi

@@ -31 +31 @@
 use lib '.';    ##uselib##
 
-use DNSDB qw(:ALL);
+use DNSDB;
 
 # Let's do these templates right...
@@ -48 +48 @@
 $webvar{revrec} = 'n' if !$webvar{revrec};      # non-reverse (domain) records
 
-# 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 once we get to trying that
-##fixme:  pass params to loadConfig, and use them there, to allow one codebase to support multiple sites
-if (!loadConfig()) {
-  warn "Using default configuration;  unable to load custom settings: $DNSDB::errstr";
-}
+my $dnsdb = new DNSDB;
 
 # Check the session and if we have a zone ID to retrieve.  Call a failure sub if not.
 my $sid = ($webvar{sid} ? $webvar{sid} : undef);
-my $session = new CGI::Session("driver:File", $sid, {Directory => $config{sessiondir}})
+my $session = new CGI::Session("driver:File", $sid, {Directory => $dnsdb->{sessiondir}})
         or die CGI::Session->errstr();
 do_not_pass_go() if !$sid;
 do_not_pass_go() if !$webvar{id};
-
-##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($config{dbname}, $config{dbuser}, $config{dbpass}, $config{dbhost});
-# Load config pieces from the database.  Ideally all but the DB user/pass/etc should be loaded here.
-initGlobals($dbh);
 
 my $zone;

trunk/tiny-import.pl

@@ -27 +27 @@
 
 use lib '.';
-use DNSDB qw(:ALL);
-
-if (!loadConfig()) {
-  warn "Using default configuration;  unable to load custom settings: $DNSDB::errstr";
-}
+use DNSDB;
+
+my $dnsdb = new DNSDB;
 
 usage() if !@ARGV;
@@ -77 +75 @@
 
 my $code;
-my ($dbh,$msg) = connectDB($config{dbname}, $config{dbuser}, $config{dbpass}, $config{dbhost});
-initGlobals($dbh) if $dbh;
+my $dbh = $dnsdb->{dbh};
 
 $dbh->{AutoCommit} = 0;
@@ -251 +248 @@
     my $nodefer = shift || 0;
     my $impok = 1;
+    my $msg;
 
     $errstr = $rec;  # this way at least we have some idea what went <splat>
@@ -269 +267 @@
       $loc = '' if !$loc;
       $loc = '' if $loc =~ /^:+$/;
-      my $fparent = DNSDB::_hostparent($dbh, $host);
+      my $fparent = $dnsdb->_hostparent($host);
       my ($rparent) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet >> ?", undef, ($ip));
       if ($fparent && $rparent) {
@@ -308 +306 @@
 
       } else {
-        my $fparent = DNSDB::_hostparent($dbh, $host);
+        my $fparent = $dnsdb->_hostparent($host);
         if ($fparent) {
           $recsth->execute($fparent, 0, $host, 5, $targ, 0, 0, 0, $ttl, $loc);
@@ -344 +342 @@
         }
       } else {
-        my $fparent = DNSDB::_hostparent($dbh, $zone);
+        my $fparent = $dnsdb->_hostparent($zone);
         if ($fparent) {
           $recsth->execute($fparent, 0, $zone, 2, $ns, 0, 0, 0, $ttl, $loc);
@@ -396 +394 @@
       $loc = '' if $loc =~ /^:+$/;
 
-      my $domid = DNSDB::_hostparent($dbh, $host);
+      my $domid = $dnsdb->_hostparent($host);
       if ($domid) {
         $recsth->execute($domid, 0, $host, 1, $ip, 0, 0, 0, $ttl, $loc);
@@ -447 +445 @@
 
       # allow for subzone MXes, since it's perfectly legitimate to simply stuff it all in a single parent zone
-      my $domid = DNSDB::_hostparent($dbh, $zone);
+      my $domid = $dnsdb->_hostparent($zone);
       if ($domid) {
         $recsth->execute($domid, 0, $zone, 15, $host, $dist, 0, 0, $ttl, $loc);
@@ -473 +471 @@
         $recsth->execute(0, $rparent, $rdata, 16, "$msg", 0, 0, 0, $ttl, $loc);
       } else {
-        my $domid = DNSDB::_hostparent($dbh, $fqdn);
+        my $domid = $dnsdb->_hostparent($fqdn);
         if ($domid) {
           $recsth->execute($domid, 0, $fqdn, 16, $rdata, 0, 0, 0, $ttl, $loc);
@@ -588 +586 @@
 #  }
 
-        my $domid = DNSDB::_hostparent($dbh, $fqdn);
+        my $domid = $dnsdb->_hostparent($fqdn);
         if ($domid) {
           $recsth->execute($domid, 0, $fqdn, 33, $target, $prio, $weight, $port, $ttl, $loc) if $domid;
@@ -606 +604 @@
         my $val = NetAddr::IP->new(join(':', @v6));
 
-        my $fparent = DNSDB::_hostparent($dbh, $fqdn);
+        my $fparent = $dnsdb->_hostparent($fqdn);
         if ($fparent) {
           $recsth->execute($fparent, 0, $fqdn, 28, $val->addr, 0, 0, 0, $ttl, $loc);
@@ -628 +626 @@
           }
         } else {
-          my $domid = DNSDB::_hostparent($dbh, $fqdn);
+          my $domid = $dnsdb->_hostparent($fqdn);
           if ($domid) {
             $recsth->execute($domid, 0, $fqdn, 16, $txtstring, 0, 0, 0, $ttl, $loc);
@@ -656 +654 @@
           }
         } else {
-          my $domid = DNSDB::_hostparent($dbh, $fqdn);
+          my $domid = $dnsdb->_hostparent($fqdn);
           if ($domid) {
             $recsth->execute($domid, 0, $fqdn, 17, "$email $txtrec", 0, 0, 0, $ttl, $loc);
@@ -672 +670 @@
 
         # these do not make sense in a reverse zone, since they're logically attached to an A record
-        my $domid = DNSDB::_hostparent($dbh, $fqdn);
+        my $domid = $dnsdb->_hostparent($fqdn);
         if ($domid) {
           $recsth->execute($domid, 0, $fqdn, 44, $sshfp, 0, 0, 0, $ttl, $loc);

trunk/vega-import.pl

@@ -29 +29 @@
 use Data::Dumper;
 
-use DNSDB qw(:ALL);
-
-if (!loadConfig()) {
-  warn "Using default configuration;  unable to load custom settings: $DNSDB::errstr";
-}
+use DNSDB;
+
+my $dnsdb = new DNSDB;
 
 my $mode = 'add';
@@ -45 +43 @@
 $mode = $ARGV[0] if $ARGV[0];
 
-my ($newdbh,$msg) = connectDB($config{dbname}, $config{dbuser}, $config{dbpass}, $config{dbhost});
+my $newdbh = $dnsdb->{dbh};
 $newdbh->{PrintError} = 1;
 $newdbh->{PrintWarn} = 1;
-initGlobals($newdbh);
 
 my %vegatypes = ('S' => 'SOA', 'N' => 'NS', 'A' => 'A', 'T' => 'TXT',