From 8b4870fa7d2c6384d339fcc6e3f99d1bebddbf02 Mon Sep 17 00:00:00 2001 From: Andrew Lewis Date: Mon, 29 Aug 2016 12:21:35 +0200 Subject: [PATCH] [Minor] Rein in excess QP/base64 symbols --- conf/metrics.conf | 70 +++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/conf/metrics.conf b/conf/metrics.conf index 8a4eef978..944131080 100644 --- a/conf/metrics.conf +++ b/conf/metrics.conf @@ -26,6 +26,44 @@ metric { greylist = 4; } + group "excessqp" { + max_score = 2.4; + symbol "FROM_EXCESS_QP" { + weight = 1.2; + description = "From that contains encoded characters while quoted-printable is not needed as all symbols are 7bit"; + } + symbol "TO_EXCESS_QP" { + weight = 1.2; + description = "To that contains encoded characters while quoted-printable is not needed as all symbols are 7bit"; + } + symbol "REPLYTO_EXCESS_QP" { + weight = 1.2; + description = "Reply-To that contains encoded characters while quoted-printable is not needed as all symbols are 7bit"; + } + symbol "CC_EXCESS_QP" { + weight = 1.2; + description = "Cc that contains encoded characters while quoted-printable is not needed as all symbols are 7bit"; + } + } + group "excessb64" { + max_score = 3.0; + symbol "FROM_EXCESS_BASE64" { + weight = 1.5; + description = "From that contains encoded characters while base 64 is not needed as all symbols are 7bit"; + } + symbol "TO_EXCESS_BASE64" { + weight = 1.5; + description = "To that contains encoded characters while base 64 is not needed as all symbols are 7bit"; + } + symbol "REPLYTO_EXCESS_BASE64" { + weight = 1.5; + description = "Reply-To that contains encoded characters while base 64 is not needed as all symbols are 7bit"; + } + symbol "CC_EXCESS_BASE64" { + weight = 1.5; + description = "Cc that contains encoded characters while base 64 is not needed as all symbols are 7bit"; + } + } group "header" { symbol "MISSING_SUBJECT" { weight = 2.0; @@ -87,38 +125,6 @@ metric { weight = 2.0; description = "To header is missing"; } - symbol "FROM_EXCESS_BASE64" { - weight = 1.5; - description = "From that contains encoded characters while base 64 is not needed as all symbols are 7bit"; - } - symbol "FROM_EXCESS_QP" { - weight = 1.2; - description = "From that contains encoded characters while quoted-printable is not needed as all symbols are 7bit"; - } - symbol "TO_EXCESS_BASE64" { - weight = 1.5; - description = "To that contains encoded characters while base 64 is not needed as all symbols are 7bit"; - } - symbol "TO_EXCESS_QP" { - weight = 1.2; - description = "To that contains encoded characters while quoted-printable is not needed as all symbols are 7bit"; - } - symbol "REPLYTO_EXCESS_BASE64" { - weight = 1.5; - description = "Reply-To that contains encoded characters while base 64 is not needed as all symbols are 7bit"; - } - symbol "REPLYTO_EXCESS_QP" { - weight = 1.2; - description = "Reply-To that contains encoded characters while quoted-printable is not needed as all symbols are 7bit"; - } - symbol "CC_EXCESS_BASE64" { - weight = 1.5; - description = "Cc that contains encoded characters while base 64 is not needed as all symbols are 7bit"; - } - symbol "CC_EXCESS_QP" { - weight = 1.2; - description = "Cc that contains encoded characters while quoted-printable is not needed as all symbols are 7bit"; - } symbol "R_MIXED_CHARSET" { weight = 5.0; description = "Mixed characters in a message"; -- 2.39.5