Changeset 286

Timestamp:

03/23/12 13:25:45 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Convert action logging for "Add reverse zone" to DNSDB-internal. See #35

• don't pass userdata, either in the upstream caller (dns.cgi) or internally to _log()
• don't expect userdata to be passed in

Fix up some warning-message-propagation in addRDNS()
Remove domain_id from addDomain() failure logging; if the domain wasn't
added then the log can't usefully refer to it by domain ID.
File off stale ##fixme's on reclist page
Fine-tune handling of message parameters in changepage(); if we're
going to go to the effort of converting newlines to <br> we should
use the result.

Location:

trunk

Files:

• DNSDB.pm (modified) (7 diffs)
• dns.cgi (modified) (3 diffs)

trunk/DNSDB.pm

@@ -1327 +1327 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    _log($dbh, (domain_id => $dom_id, group_id => $group, entry => "Failed adding domain $domain ($msg)"))
+    _log($dbh, (group_id => $group, entry => "Failed adding domain $domain ($msg)"))
         if $config{log_failures};
     $dbh->commit;       # since we enabled transactions earlier
@@ -1470 +1470 @@
 ## DNSDB::addRDNS
 # Adds a reverse DNS zone
-# Takes a database handle, CIDR block, numeric group, boolean(ish) state (active/inactive),
-# and user info hash (for logging).
+# Takes a database handle, CIDR block, reverse DNS pattern, numeric group,
+# and boolean(ish) state (active/inactive)
 # Returns a status code and message
 sub addRDNS {
@@ -1481 +1481 @@
   my $state = shift;
 
-  my %userinfo = @_;    # remaining bits.
-# user ID, username, user full name
-
   $state = 1 if $state =~ /^active$/;
   $state = 1 if $state =~ /^on$/;
@@ -1513 +1510 @@
     ($rdns_id) = $dbh->selectrow_array("SELECT currval('revzones_rdns_id_seq')");
 
-    _log($dbh, (rdns_id => $rdns_id, user_id => $userinfo{id}, group_id => $group, username => $userinfo{name},
+    _log($dbh, (rdns_id => $rdns_id, group_id => $group,
         entry => "Added ".($state ? 'active' : 'inactive')." reverse zone $zone"));
 
@@ -1576 +1573 @@
         my @tmp1 = split /:/, $host;
         my @tmp2 = split /:/, $val;
-        _log($dbh, (rdns_id => $rdns_id, user_id => $userinfo{id}, group_id => $group,
-                username => $userinfo{name}, entry =>
-                "[new $zone] Added SOA record [contact $tmp1[0]] [master $tmp1[1]] ".
+        _log($dbh, (rdns_id => $rdns_id, group_id => $group,
+                entry => "[new $zone] Added SOA record [contact $tmp1[0]] [master $tmp1[1]] ".
                 "[refresh $tmp2[0]] [retry $tmp2[1]] [expire $tmp2[2]] [minttl $tmp2[3]], TTL $ttl"));
         $defttl = $tmp2[3];
       } else {
         my $logentry = "[new $zone] Added record '$host $typemap{$type}";
-        _log($dbh, (rdns_id => $rdns_id, domain_id => $domid, user_id => $userinfo{id}, group_id => $group,
-                username => $userinfo{name}, entry =>
-                $logentry." $val', TTL $ttl"));
+        _log($dbh, (rdns_id => $rdns_id, domain_id => $domid, group_id => $group,
+                entry => $logentry." $val', TTL $ttl"));
       }
     }
@@ -1606 +1601 @@
 
       $sth_in->execute($domid,$host,$type,$val,$defttl);
+      my $logentry = "[new $zone] Added record '$host $typemap{$type}";
+      _log($dbh, (rdns_id => $rdns_id, domain_id => $domid, group_id => $group,
+        entry => $logentry." $val', TTL $defttl from pattern"));
     }
 
     # If there are warnings (presumably about default records skipped for cause) log them
-    _log($dbh, (rdns_id => $rdns_id, user_id => $userinfo{id}, group_id => $group,
-        username => $userinfo{name}, entry => "Warning(s) adding $zone:$warnstr"))
+    _log($dbh, (rdns_id => $rdns_id, group_id => $group, entry => "Warning(s) adding $zone:$warnstr"))
         if $warnstr;
 
@@ -1620 +1617 @@
     my $msg = $@;
     eval { $dbh->rollback; };
+    _log($dbh, (group_id => $group, entry => "Failed adding reverse zone $zone ($msg)"))
+        if $config{log_failures};
+    $dbh->commit;       # since we enabled transactions earlier
     return ('FAIL',$msg);
   } else {
-    return ('OK',$rdns_id);
+    my $retcode = 'OK';
+    if ($warnstr) {
+      $resultstr = $warnstr;
+      $retcode = 'WARN';
+    }
+    return ($retcode, $rdns_id);
   }
 

trunk/dns.cgi

@@ -489 +489 @@
 
   my ($code,$msg) = addRDNS($dbh, $webvar{revzone}, $webvar{revpatt}, $webvar{group},
-        ($webvar{makeactive} eq 'on' ? 1 : 0),
-        (username => $session->param("username"), id => $session->param("uid")) );
+        ($webvar{makeactive} eq 'on' ? 1 : 0));
 
   if ($code eq 'OK') {
-    logaction(0, $session->param("username"), $webvar{group}, "Added reverse zone $webvar{revzone}", $msg);
     changepage(page => "reclist", id => $msg, revrec => 'y');
+  } elsif ($code eq 'WARN') {
+    changepage(page => "reclist", id => $msg, revrec => 'y', warnmsg => $DNSDB::resultstr);
   } else {
-    logaction(0, $session->param("username"), $webvar{group}, "Failed adding reverse zone $webvar{revzone} ($msg)");
     $session->param('add_failed', 1);
     changepage(page => "newrevzone", revzone => $webvar{revzone}, revpatt => $webvar{revpatt}, errmsg => $msg);
@@ -602 +601 @@
     showzone($webvar{defrec}, $webvar{revrec}, $webvar{id});
     if ($webvar{defrec} eq 'n') {
-#      showzone('n',$webvar{id});
-##fixme:  permission for viewing logs?
-##fixme:  determine which slice of the log we view (group, domain, revzone)
       if ($webvar{revrec} eq 'n') {
         $page->param(logdom => 1);
@@ -1868 +1864 @@
   foreach my $sessme ('resultmsg','warnmsg','errmsg') {
     if (my $tmp = $params{$sessme}) {
+      $tmp =~ s/^\n//;
       $tmp =~ s|\n|<br />\n|g;
-      $session->param($sessme, $params{$sessme});
+      $session->param($sessme, $tmp);
       delete $params{$sessme};
     }