Bug 1185823 - add additional [audit] syslog entries

2 files changed, 10 insertions, 23 deletions

diff --git a/extensions/AntiSpam/Extension.pm b/extensions/AntiSpam/Extension.pm
index 7e1823346..2abba291d 100644
--- a/extensions/AntiSpam/Extension.pm
+++ b/extensions/AntiSpam/Extension.pm
@@ -16,9 +16,7 @@ use Bugzilla::Error;
 use Bugzilla::Group;
 use Bugzilla::Util qw(remote_ip trick_taint);
 use Email::Address;
-use Encode;
 use Socket;
-use Sys::Syslog qw(:DEFAULT setlogsock);
 
 our $VERSION = '1';
 
@@ -39,7 +37,7 @@ sub _project_honeypot_blocking {
     return if $status != 127
               || $threat < Bugzilla->params->{honeypot_threat_threshold};
 
-    _syslog(sprintf("[audit] blocked <%s> from creating %s, honeypot %s", $ip, $login, $honeypot));
+    Bugzilla->audit(sprintf("blocked <%s> from creating %s, honeypot %s", $ip, $login, $honeypot));
     ThrowUserError('account_creation_restricted');
 }
 
@@ -73,6 +71,7 @@ sub _comment_blocking {
 
     my $regex = '\b(?:' . join('|', map { quotemeta } @$blocklist) . ')\b';
     if ($params->{thetext} =~ /$regex/i) {
+        Bugzilla->audit(sprintf("blocked <%s> %s from commenting, blacklisted phrase", remote_ip(), $user->login));
         ThrowUserError('antispam_comment_blocked');
     }
 }
@@ -90,7 +89,7 @@ sub _domain_blocking {
         $address->host
     );
     if ($blocked) {
-        _syslog(sprintf("[audit] blocked <%s> from creating %s, blacklisted domain", remote_ip(), $login));
+        Bugzilla->audit(sprintf("blocked <%s> from creating %s, blacklisted domain", remote_ip(), $login));
         ThrowUserError('account_creation_restricted');
     }
 }
@@ -109,7 +108,7 @@ sub _ip_blocking {
         $ip
     );
     if ($blocked) {
-        _syslog(sprintf("[audit] blocked <%s> from creating %s, blacklisted IP", $ip, $login));
+        Bugzilla->audit(sprintf("blocked <%s> from creating %s, blacklisted IP", $ip, $login));
         ThrowUserError('account_creation_restricted');
     }
 }
@@ -139,7 +138,7 @@ sub _cc_limit {
 
     my $cc_count = ref($params->{$cc_field}) ? scalar(@{ $params->{$cc_field} }) : 1;
     if ($cc_count > Bugzilla->params->{antispam_multi_user_limit_count}) {
-        _syslog(sprintf("[audit] blocked <%s> from CC'ing %s users", Bugzilla->user->login, $cc_count));
+        Bugzilla->audit(sprintf("blocked <%s> from CC'ing %s users", Bugzilla->user->login, $cc_count));
         delete $params->{$cc_field};
         if (exists $params->{cc} && exists $params->{cc}->{add}) {
             delete $params->{cc}->{add};
@@ -153,7 +152,7 @@ sub bug_set_flags {
 
     my $flag_count = @{ $args->{new_flags} };
     if ($flag_count > Bugzilla->params->{antispam_multi_user_limit_count}) {
-        _syslog(sprintf("[audit] blocked <%s> from flaging %s users", Bugzilla->user->login, $flag_count));
+        Bugzilla->audit(sprintf("blocked <%s> from flaging %s users", Bugzilla->user->login, $flag_count));
         # empty the arrayref
         $#{ $args->{new_flags} } = -1;
     }
@@ -230,7 +229,7 @@ sub comment_after_add_tag {
         );
         $author->set_disable_mail(1);
         $author->update();
-        _syslog(sprintf("[audit] antispam disabled <%s>: %s", $author->login, $reason));
+        Bugzilla->audit(sprintf("antispam disabled <%s>: %s", $author->login, $reason));
     }
 }
 
@@ -369,15 +368,4 @@ sub db_schema_abstract_schema {
     };
 }
 
-#
-# utilities
-#
-
-sub _syslog {
-    my $message = shift;
-    openlog('apache', 'cons,pid', 'local4');
-    syslog('notice', encode_utf8($message));
-    closelog();
-}
-
 __PACKAGE__->NAME;
diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index 3d46ead6b..ccf079b06 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -49,7 +49,7 @@ use File::MimeInfo::Magic;
 use List::MoreUtils qw(natatime any);
 use List::Util qw(first);
 use Scalar::Util qw(blessed);
-use Sys::Syslog qw(:DEFAULT setlogsock);
+use Sys::Syslog qw(:DEFAULT);
 use Text::Balanced qw( extract_bracketed extract_multiple );
 
 use Bugzilla::Extension::BMO::Constants;
@@ -741,7 +741,7 @@ sub object_end_of_create {
         my $user = $args->{object};
 
         # Log real IP addresses for auditing
-        _syslog(sprintf('[audit] <%s> created user %s', remote_ip(), $user->login));
+        Bugzilla->audit(sprintf('<%s> created user %s', remote_ip(), $user->login));
 
         # Add default searches to new user's footer
         my $dbh = Bugzilla->dbh;
@@ -762,8 +762,7 @@ sub object_end_of_create {
 
     } elsif ($class eq 'Bugzilla::Bug') {
         # Log real IP addresses for auditing
-        _syslog(sprintf('[audit] %s <%s> created bug %s',
-            Bugzilla->user->login, remote_ip(), $args->{object}->id));
+        Bugzilla->audit(sprintf('%s <%s> created bug %s', Bugzilla->user->login, remote_ip(), $args->{object}->id));
     }
 }