From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 20 Apr 2018 11:14:15 +0000 (+0100)
Subject: [Minor] Add option to ignore specific symbols in report
X-Git-Tag: 1.7.4~61
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=13efe6117d660c7f90302cabfe7f1f083a09c660;p=rspamd.git

[Minor] Add option to ignore specific symbols in report
---

diff --git a/utils/rspamd_stats.pl b/utils/rspamd_stats.pl
index 39a3debc2..9d8140c5f 100755
--- a/utils/rspamd_stats.pl
+++ b/utils/rspamd_stats.pl
@@ -13,6 +13,7 @@ my @symbols_search;
 my @symbols_exclude;
 my @symbols_bidirectional;
 my @symbols_groups;
+my @symbols_ignored;
 my %groups;
 my $reject_score = 15.0;
 my $junk_score = 6.0;
@@ -43,6 +44,7 @@ GetOptions(
   "symbol|s=s@"           => \@symbols_search,
   "symbol-bidir|S=s@"     => \@symbols_bidirectional,
   "exclude|X=s@"          => \@symbols_exclude,
+  "ignore=s@"             => \@symbols_ignored,
   "group|g=s@"            => \@symbols_groups,
   "log|l=s"               => \$log_file,
   "alpha-score|alpha|a=f" => \$diff_alpha,
@@ -165,6 +167,18 @@ else {
 
 exit;
 
+sub IsIgnored {
+  my ($sym) = @_;
+
+  foreach my $ex (@symbols_ignored) {
+    if ($sym =~ /^$ex$/) {
+      return 1;
+    }
+  }
+
+  return 0;
+}
+
 sub GenRelated {
   my ($htb, $target_sym) = @_;
 
@@ -390,13 +404,21 @@ Messages scanned: $total";
 }
 
 sub ProcessRelated {
-  my ($symbols, $target) = @_;
+  my ($symbols, $target, $source) = @_;
 
   foreach my $s (@{$symbols}) {
     $s =~ /^([^\(]+)(\(([^\)]+)\))?/;
     my $sym_name = $1;
     my $sym_score = 0;
 
+    if ($groups{$sym_name}) {
+      $sym_name = $groups{$sym_name};
+    }
+
+    next if ($source eq $sym_name);
+
+    next if IsIgnored($sym_name);
+
     if ($2) {
       $sym_score = $3 * 1.0;
 
@@ -521,13 +543,13 @@ sub ProcessLog {
 
             next if $orig_name !~ /^$s/;
 
-            push @sym_names, $sym_name;
-
             if ($groups{$s}) {
               # Replace with group
               $sym_name = $groups{$s};
             }
 
+            push @sym_names, $sym_name;
+
             if (!$sym_res{$sym_name}) {
               $sym_res{$sym_name} = {
                 hits             => 0,
@@ -554,19 +576,19 @@ sub ProcessLog {
               $is_spam = 1;
               $r->{spam_hits} ++;
               if ($correlations) {
-                ProcessRelated(\@symbols, $r->{symbols_met_spam});
+                ProcessRelated(\@symbols, $r->{symbols_met_spam}, $sym_name);
               }
             }
             elsif ($score >= $junk_score) {
               $is_junk = 1;
               $r->{junk_hits} ++;
               if ($correlations) {
-                ProcessRelated(\@symbols, $r->{symbols_met_junk});
+                ProcessRelated(\@symbols, $r->{symbols_met_junk}, $sym_name);
               }
             }
             else {
               if ($correlations) {
-                ProcessRelated(\@symbols, $r->{symbols_met_ham});
+                ProcessRelated(\@symbols, $r->{symbols_met_ham}, $sym_name);
               }
             }
 
@@ -596,6 +618,7 @@ sub ProcessLog {
 
       if ($correlations) {
         foreach my $sym (@sym_names) {
+          next if IsIgnored($sym);
           my $r = $sym_res{$sym};
 
           foreach my $corr_sym (@sym_names) {