Changeset 733 for trunk/dns.cgi

Timestamp:

06/23/16 16:52:59 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Add log filtering supporting redirecting to a "base" log set for user,
domain, or revzone, and a free text field to filter the entries. Closes #17.

While we're meddling with the log entry retrieval, start an experiment
to merge getFooCount() and getFooList() subs. See #62.

File:

• trunk/dns.cgi (modified) (3 diffs)

trunk/dns.cgi

@@ -1795 +1795 @@
 ##fixme:  where should we call this from?
     $id = $webvar{id};
-    if (!check_scope(id => $id, type => 'user')) {
-      $page->param(errmsg => "You are not permitted to view log entries for the requested user");
-      goto DONELOG;
-    }
-    $page->param(logfor => 'user '.$dnsdb->userFullName($id));
+##fixme:  don't include username on out-of-scope users
+    $page->param(logfor => 'user '.($id ? $dnsdb->userFullName($id) : $webvar{fname}));
   } elsif ($webvar{ltype} && $webvar{ltype} eq 'dom') {
     $id = $webvar{id};
@@ -1821 +1818 @@
   }
   $webvar{ltype} = 'group' if !$webvar{ltype};
-  my $lcount = $dnsdb->getLogCount(id => $id, logtype => $webvar{ltype}) or push @debugbits, $dnsdb->errstr;
+
+  # Done here since we want to allow more arbitrary blobs in the log filter
+  if (defined($webvar{logfilter})) {
+    $session->param('logfilter', '') if !$session->param('logfilter');
+    if ($webvar{logfilter} ne $session->param('logfilter')) {
+      $uri_self =~ s/\&offset=[^&]//;
+      $offset = 0;
+    }
+    $session->param('logfilter', $webvar{logfilter})
+  }
+  my $logfilter = $session->param('logfilter');
+
+  my $lcount = $dnsdb->getLogCount(id => $id, group => $logingroup, fname => $webvar{fname},
+    logtype => $webvar{ltype}, filter => $logfilter);
+  if (!$lcount) {
+    $page->param(errmsg => $dnsdb->errstr);
+    $lcount = 0;
+  }
 
   $page->param(id => $id);
@@ -1840 +1854 @@
 
   # Set up the column headings with the sort info
-  my @cols = ('fname','username','entry','stamp');
-  my %colnames = (fname => 'Name', username => 'Username', entry => 'Log Entry', stamp => 'Date/Time');
+  my @cols = ('fname','domain','revzone','entry','stamp');
+  my %colnames = (fname => 'Name', domain => 'Forward zone', revzone => 'Reverse zone',
+      entry => 'Log Entry', stamp => 'Date/Time');
   fill_colheads($sortby, $sortorder, \@cols, \%colnames);
 
 ##fixme:  increase per-page limit or use separate limit for log?  some ops give *lots* of entries...
-  my $logentries = $dnsdb->getLogEntries(id => $id, logtype => $webvar{ltype},
-        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder);
-  $page->param(logentries => $logentries);
+  my $logentries = $dnsdb->getLogEntries(id => $id, group => $logingroup, fname => $webvar{fname},
+        logtype => $webvar{ltype},
+        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder, filter => $logfilter);
+  if (!$logentries) {
+    $page->param(errmsg => $dnsdb->errstr);
+  } else {
+    # undef $logentries is inexplicably puking instead of showing "no entries found",
+    # like all the rest of the methods that return a list the same way.  idunno...
+    $page->param(logentries => $logentries);
+  }
 
 ##fixme:
-# - filtering
-# - show reverse zone column?
 # - on log record creation, bundle "parented" log actions (eg, "AXFR record blah for domain foo",
 #   or "Add record bar for new domain baz") into one entry (eg, "AXFR domain foo", "Add domain baz")?