Changeset 733 for trunk/DNSDB.pm

Timestamp:

06/23/16 16:52:59 (8 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/DNSDB.pm (modified) (4 diffs)

trunk/DNSDB.pm

@@ -4812 +4812 @@
 # Get a count of log entries
 # Takes a database handle and a hash containing at least:
-# - Entity ID and entity type as the primary log "slice"
+# - Entity identifier and entity type as the primary log "slice"
 sub getLogCount {
   my $self = shift;
-  my $dbh = $self->{dbh};
-
-  my %args = @_;
-
-  my @filterargs;
-##fixme:  which fields do we want to filter on?
-# push @filterargs, 
-
-  $errstr = 'Missing primary parent ID and/or type';
-  # fail early if we don't have a "prime" ID to look for log entries for
-  return if !$args{id};
-
-  # or if the prime id type is missing or invalid
-  return if !$args{logtype};
-  $args{logtype} = 'revzone' if $args{logtype} eq 'rdns';       # hack pthui
-  $args{logtype} = 'domain' if $args{logtype} eq 'dom';         # hack pthui
-  return if !grep /^$args{logtype}$/, ('group', 'domain', 'revzone', 'user');
-
-  my $sql = "SELECT count(*) FROM log ".
-        "WHERE $id_col{$args{logtype}}=?".
-        ($args{filter} ? " AND entry ~* ?" : '');
-  my ($count) = $dbh->selectrow_array($sql, undef, ($args{id}, @filterargs) );
-  $errstr = $dbh->errstr if !$count;
-  return $count;
+  return $self->getLogEntries(@_, count => 1);
 } # end getLogCount()
 
@@ -4845 +4822 @@
 # Get a list of log entries
 # Takes arguments as with getLogCount() above, plus optional:
+# - "count" flag 
+#  OR
 # - sort field
 # - sort order
@@ -4856 +4835 @@
   my @filterargs;
 
-  # fail early if we don't have a "prime" ID to look for log entries for
-  return if !$args{id};
-
-  # or if the prime id type is missing or invalid
+  # fail if the prime id type is missing or invalid
+  $errstr = "Missing primary log slice type";
   return if !$args{logtype};
   $args{logtype} = 'revzone' if $args{logtype} eq 'rdns';       # hack pthui
   $args{logtype} = 'domain' if $args{logtype} eq 'dom';         # hack pthui
+  $errstr = "Invalid primary log slice type";
   return if !grep /^$args{logtype}$/, ('group', 'domain', 'revzone', 'user');
+
+  # fail if we don't have a prime ID to look for log entries for
+  $errstr = "Missing ID for primary log slice";
+  return if !($args{id} || $args{fname});
 
   # Sorting defaults
@@ -4870 +4852 @@
   $args{offset} = 0 if !$args{offset} || $args{offset} !~ /^(?:all|\d+)$/;
 
-  my %sortmap = (fname => 'name', username => 'email', entry => 'entry', stamp => 'stamp');
+  my %sortmap = (fname => 'name', username => 'email', entry => 'entry', stamp => 'stamp',
+      revzone => 'revnet', domain => 'domain');
   $args{sortby} = $sortmap{$args{sortby}};
 
-  my $sql = "SELECT user_id AS userid, email AS useremail, name AS userfname, entry AS logentry, ".
-        "date_trunc('second',stamp) AS logtime ".
-        "FROM log ".
-        "WHERE $id_col{$args{logtype}}=?".
-        ($args{filter} ? " AND entry ~* ?" : '').
-        " ORDER BY $args{sortby} $args{sortorder}, log_id $args{sortorder}".
+  push @filterargs, $args{filter} if $args{filter};
+  my $sql;
+  if ($args{count}) {
+    $sql = "SELECT count(*) FROM log l ";
+  } else {
+    $sql = "SELECT l.user_id AS userid, l.name AS userfname, d.domain, l.domain_id, r.revnet AS revzone, ".
+        "l.rdns_id, l.entry AS logentry, date_trunc('second',l.stamp) AS logtime ".
+        "FROM log l ".
+        "LEFT JOIN domains d ON l.domain_id = d.domain_id ".
+        "LEFT JOIN revzones r ON l.rdns_id = r.rdns_id ";
+  }
+
+  # decide which ID argument to use.  Only use the "full name" if no normal ID is present
+  my $idarg;
+  if ($args{id}) {
+    $sql .= "WHERE l.$id_col{$args{logtype}} = ? ";
+    $idarg = $args{id};
+  } else {
+    $sql .= "WHERE l.name = ? ";
+    $idarg = $args{fname};
+  }
+
+  # add the entry filter, if any
+  $sql .= ($args{filter} ? " AND entry ~* ?" : '');
+
+  # Limit scope based on group.  Mainly useful for ltype==user, so subgroup
+  # users can see what the deities in parent groups have done to their domains.
+  if ($args{group} != 1) {
+    my @grouplist;
+    $self->getChildren($args{group}, \@grouplist);
+    my $groupset = join(',', $args{group}, @grouplist);
+    $sql .= " AND l.group_id IN ($groupset)";
+  }
+
+  if ($args{count}) {
+    my ($count) = $dbh->selectrow_array($sql, undef, ($idarg, @filterargs) );
+    $errstr = $dbh->errstr if !$count;
+    return $count;
+  } else {
+    $sql .= " ORDER BY $args{sortby} $args{sortorder}, log_id $args{sortorder}".
         ($args{offset} eq 'all' ? '' : " LIMIT $self->{perpage} OFFSET ".$args{offset}*$self->{perpage});
-  my $loglist = $dbh->selectall_arrayref($sql, { Slice => {} }, ($args{id}, @filterargs) );
-  $errstr = $dbh->errstr if !$loglist;
-  return $loglist;
+    my $loglist = $dbh->selectall_arrayref($sql, { Slice => {} }, ($idarg, @filterargs) );
+    $errstr = $dbh->errstr if !$loglist;
+    return $loglist;
+  }
+
+  # Your llama is on fire
+
 } # end getLogEntries()