svn commit: r1883157 - in /spamassassin/trunk/lib/Mail/SpamAssassin: Conf.pm PerMsgStatus.pm

[gb...@apache.org]

Author: gbechis
Date: Fri Nov  6 09:48:51 2020
New Revision: 1883157

URL: http://svn.apache.org/viewvc?rev=1883157&view=rev
Log:
Add a nolog tflag to be able to hide in reports informations
coming from rules.

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1883157&r1=1883156&r2=1883157&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Fri Nov  6 09:48:51 2020
@@ -3535,6 +3535,10 @@ it is documented there.
 This flag is specific to rules invoking an URIDNSBL plugin,
 it is documented there.
 
+=item nolog
+
+This flag will hide (sensitive) rule informations from reports
+
 =back
 
 =cut
@@ -5398,6 +5402,7 @@ sub feature_bayes_stopwords { 1 } # mult
 sub feature_get_host { 1 } # $pms->get() :host :domain :ip :revip # was implemented together with AskDNS::has_tag_header # Bug 7734
 sub feature_blocklist_welcomelist { 1 } # bz 7826
 sub has_tflags_nosubject { 1 } # tflags nosubject
+sub has_tflags_nolog { 1 } # tflags nolog
 sub perl_min_version_5010000 { return $] >= 5.010000 }  # perl version check ("perl_version" not neatly backwards-compatible)
 
 ###########################################################################

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1883157&r1=1883156&r2=1883157&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Fri Nov  6 09:48:51 2020
@@ -2882,6 +2882,11 @@ sub _handle_hit {
 
     # save both summaries
     # TODO: this is slower than necessary, if we only need one
+    my $tflags = $self->{conf}->{tflags};
+    if (exists $tflags->{$rule} and $tflags->{$rule} =~ /\bnolog\b/) {
+      $self->{test_log_msgs}->{TERSE} = sprintf ("[%s]\n", "*REDACTED*");
+      $self->{test_log_msgs}->{LONG} =  sprintf ("%27s [%s]\n", "", "*REDACTED*");
+    }
     $self->{tag_data}->{REPORT} .= sprintf ("* %s %s %s%s\n%s",
               $score, $rule, $area,
               $self->_wrap_desc($desc,