Changeset 91 for trunk

Timestamp:

04/13/11 16:00:10 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

SQL tabledef update:

• Tweak log table definition to cope with looooong entries (mainly from AXFR warnings)

DNSDB.pm:

• Add domainID and getRecCount subs in DNSDB
• Return more user-friendly error on attempting to add a domain with no name
• Nitpick-tweak DB calls and SQL formatting in domainName()
• Replace placeholderish OK message in importAXFR()

dns.cgi:

• Trim some more direct SQL out in reclist
• Uninitialized-variable cleanup in AXFR import
• Add logging to AXFR import
• Don't complain about uninitialized variables in record-display

Location:

trunk

Files:

• DNSDB.pm (modified) (6 diffs)
• dns.cgi (modified) (4 diffs)
• dns.sql (modified) (2 diffs)

trunk/DNSDB.pm

@@ -28 +28 @@
         &initPermissions &getPermissions &changePermissions &comparePermissions
         &connectDB &finish
-        &addDomain &delDomain &domainName
+        &addDomain &delDomain &domainName &domainID
         &addGroup &delGroup &getChildren &groupName
         &addUser &updateUser &delUser &userFullName &userStatus &getUserData
-        &getSOA &getRecLine &getDomRecs
+        &getSOA &getRecLine &getDomRecs &getRecCount
         &addRec &updateRec &delRec
         &domStatus &importAXFR
@@ -43 +43 @@
                 &initPermissions &getPermissions &changePermissions &comparePermissions
                 &connectDB &finish
-                &addDomain &delDomain &domainName
+                &addDomain &delDomain &domainName &domainID
                 &addGroup &delGroup &getChildren &groupName
                 &addUser &updateUser &delUser &userFullName &userStatus &getUserData
-                &getSOA &getRecLine &getDomRecs
+                &getSOA &getRecLine &getDomRecs &getRecCount
                 &addRec &updateRec &delRec
                 &domStatus &importAXFR
@@ -367 +367 @@
   return ('FAIL',"Need database handle") if !$dbh;
   my $domain = shift;
-  return ('FAIL',"Need domain") if !defined($domain);
+  return ('FAIL',"Domain must not be blank") if !$domain;
   my $group = shift;
   return ('FAIL',"Need group") if !defined($group);
@@ -470 +470 @@
   my $dbh = shift;
   my $domid = shift;
-  my $sth = $dbh->prepare("select domain from domains where domain_id=?");
-  $sth->execute($domid);
-  my ($domname) = $sth->fetchrow_array();
+  my ($domname) = $dbh->selectrow_array("SELECT domain FROM domains WHERE domain_id=?", undef, ($domid) );
   $errstr = $DBI::errstr if !$domname;
   return $domname if $domname;
-} # end domainName
+} # end domainName()
+
+
+## DNSDB::domainID()
+# Takes a database handle and domain name
+# Returns the domain ID number
+sub domainID {
+  $errstr = '';
+  my $dbh = shift;
+  my $domain = shift;
+  my ($domid) = $dbh->selectrow_array("SELECT domain_id FROM domains WHERE domain=?", undef, ($domain) );
+  $errstr = $DBI::errstr if !$domid;
+  return $domid if $domid;
+} # end domainID()
 
 
@@ -1086 +1097 @@
   return $ret;
 } # end getDomRecs()
+
+
+## DNSDB::getRecCount()
+# Return count of non-SOA records in domain (or default records in a group)
+# Takes a database handle, default/live flag and group/domain ID
+# Returns the count
+sub getRecCount {
+  my $dbh = shift;
+  my $defrec = shift;
+  my $id = shift;
+
+  my ($count) = $dbh->selectrow_array("SELECT count(*) FROM ".
+        ($defrec eq 'y' ? 'default_' : '')."records ".
+        "WHERE ".($defrec eq 'y' ? 'group' : 'domain')."_id=? ".
+        "AND NOT type=$reverse_typemap{SOA}", undef, ($id) );
+
+  return $count;
+
+} # end getRecCount()
 
 
@@ -1487 +1517 @@
   } else {
     return ('WARN', $warnmsg) if $warnmsg;
-    return ('OK',"ook");
+    return ('OK',"Imported OK");
   }
 

trunk/dns.cgi

@@ -249 +249 @@
   $page->param(curpage => $webvar{page});
 
-  my $sth = $dbh->prepare("SELECT count(*) FROM ".
-        ($webvar{defrec} eq 'y' ? 'default_' : '')."records ".
-        "WHERE ".($webvar{defrec} eq 'y' ? 'group' : 'domain')."_id=? ".
-        "AND NOT type=$reverse_typemap{SOA}");
-  $sth->execute($webvar{id});
-  my ($count) = ($sth->fetchrow_array);
+  my $count = getRecCount($dbh, $webvar{defrec}, $webvar{id});
 
 #  $sortby = 'host';
@@ -919 +914 @@
   $page->param(importdoms => $webvar{importdoms}) if $webvar{importdoms};
 
-##fixme: check group too?
+  # shut up warning about uninitialized variable
+  $webvar{doit} = '' if !defined($webvar{doit});
+
   if ($webvar{doit} eq 'y' && !$webvar{ifrom}) {
     $page->param(errmsg => "Need to set host to import from");
   } elsif ($webvar{doit} eq 'y' && !$webvar{importdoms}) {
     $page->param(errmsg => "Need domains to import");
-  } else {
+  } elsif ($webvar{doit} eq 'y') {
     my @domlist = split /\s+/, $webvar{importdoms};
     my @results;
-my $rnum = 0;
     foreach my $domain (@domlist) {
       my %row;
       my ($code,$msg) = importAXFR($dbh, $webvar{ifrom}, $domain, $webvar{group},
         $webvar{domstatus}, $webvar{rwsoa}, $webvar{rwns});
-##fixme: log
       $row{domok} = $msg if $code eq 'OK';
       if ($code eq 'WARN') {
@@ -939 +934 @@
       }
       if ($code eq 'FAIL') {
-        $msg =~ s|\n|<br />|g;
+        $msg =~ s|\n|<br />\n|g;
         $row{domerr} = $msg;
       }
-      # do stuff!  DNSDB::importAXFR($webvar{ifrom}, $webvar{rwsoa}, $webvar{rwns}, $domain, <flags>)
+      $msg = "<br />\n".$msg if $msg =~ m|<br />|;
+      logaction(domainID($dbh, $domain), $session->param("username"), $webvar{group},
+        "AXFR import $domain from $webvar{ifrom} ($code): $msg");
       $row{domain} = $domain;
-#      $row{row} = $rnum++;
       push @results, \%row;
     }
@@ -1224 +1220 @@
 sub fill_recdata {
   fill_rectypes($webvar{type});
+
+# le sigh.  we may get called with many empty %webvar keys
+  no warnings qw( uninitialized );
 
   $page->param(name     => $webvar{name});

trunk/dns.sql

@@ -54 +54 @@
 \.
 
+-- entry is text due to possible long entries from AXFR - a domain with "many"
+-- odd records will overflow varchar(200)
 CREATE TABLE log (
     log_id serial NOT NULL,
@@ -61 +63 @@
     email character varying(60),
     name character varying(60),
-    entry character varying(200),
+    entry text,
     stamp timestamp with time zone DEFAULT now()
 );