From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 18 Oct 2018 18:57:38 +0000 (+0100)
Subject: Merge pull request #2566 from heraklit256/composites-leave
X-Git-Tag: 1.8.2~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04fe3d3f7cad8603328788bd76947e97e9318cd9;p=thirdparty%2Frspamd.git

Merge pull request #2566 from heraklit256/composites-leave

Minor Composite rule cleanup
---

04fe3d3f7cad8603328788bd76947e97e9318cd9
diff --cc conf/composites.conf
index fc0918e004,36490d3b72..09ae5c1560
--- a/conf/composites.conf
+++ b/conf/composites.conf
@@@ -110,18 -110,15 +113,20 @@@ composites 
      PHISH_EMOTION {
          expression = "(PHISHING | DBL_PHISH | PHISHED_OPENPHISH | PHISHED_PHISHTANK) & (SUBJECT_ENDS_QUESTION | SUBJECT_ENDS_EXCLAIM)";
          description = "Phish message with subject trying to address users emotion";
-         score = 2.0;
+         score = 1.0;
+         policy = "leave";
      }
      HAS_ANON_DOMAIN {
 -        expression = "HAS_GUC_PROXY_URI | URIBL_RED | DBL_ABUSE_REDIR";
 +        expression = "HAS_GUC_PROXY_URI | URIBL_RED | DBL_ABUSE_REDIR | HAS_ONION_URI";
          description = "Contains one or more domains trying to disguise owner/destination";
-         score = 0.5;
+         score = 0.1;
+         policy = "leave";
      }
 +    BAD_REP_POLICIES {
 +      description = "Contains valid policies but are also marked by fuzzy/bayes/surbl/rbl";
 +      expression = "(~g-:policies) & (-g+:fuzzy | -g+:bayes | -g+:surbl | -g+:rbl)";
 +      score = 0.1;
 +    }
  
      .include(try=true; priority=1; duplicate=merge) "$LOCAL_CONFDIR/local.d/composites.conf"
      .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/composites.conf"