diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-08-11 11:46:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-11 11:46:43 +0100 |
| commit | bb7e01011c80eb0e6961041aa390860eef27acac (patch) | |
| tree | 1c5eaf7f9c30fe8c8cbd1c4faee40a3febb3fe32 /conf | |
| parent | e626578fc34bc92349643d318df04ae8bbd869cc (diff) | |
| parent | c98a0705466bd4303f4648a67e8d96d940723995 (diff) | |
| download | rspamd-bb7e01011c80eb0e6961041aa390860eef27acac.tar.gz rspamd-bb7e01011c80eb0e6961041aa390860eef27acac.zip | |
Merge pull request #2403 from heraklit256/extended-dnswl-scores
Add negative weight on DNSWL entries
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/composites.conf | 13 | ||||
| -rw-r--r-- | conf/mime_types.inc | 4 | ||||
| -rw-r--r-- | conf/scores.d/rbl_group.conf | 6 |
3 files changed, 16 insertions, 7 deletions
diff --git a/conf/composites.conf b/conf/composites.conf index a07b7020f..9d204344c 100644 --- a/conf/composites.conf +++ b/conf/composites.conf @@ -83,9 +83,18 @@ composites { } RCVD_UNAUTH_PBL { expression = "RECEIVED_PBL & -RCVD_VIA_SMTP_AUTH"; - description = "Relayed through ZEN PBL IP without sufficient authentication"; + description = "Relayed through ZEN PBL IP without sufficient authentication (possible indicating an open relay)"; score = 2.0; - policy = "leave"; + } + RCVD_DKIM_DNSWL_MED { + expression = "R_DKIM_ALLOW & RCVD_IN_DNSWL_MED"; + description = "Sufficiently DKIM signed and received from IP with medium trust at DNSWL"; + score = -1.5; + } + RCVD_DKIM_DNSWL_HI { + expression = "R_DKIM_ALLOW & RCVD_IN_DNSWL_HI"; + description = "Sufficiently DKIM signed and received from IP with high trust at DNSWL"; + score = -3.5; } .include(try=true; priority=1; duplicate=merge) "$LOCAL_CONFDIR/local.d/composites.conf" diff --git a/conf/mime_types.inc b/conf/mime_types.inc index 7c480d0fe..e63dff09a 100644 --- a/conf/mime_types.inc +++ b/conf/mime_types.inc @@ -203,8 +203,8 @@ application/pidf+xml 0 application/pidf-diff+xml 0 application/pkcs10 0 application/pkcs12 0 -application/pkcs7-mime -1 -application/pkcs7-signature -1 +application/pkcs7-mime 0 +application/pkcs7-signature 0 application/pkcs8 0 application/pkix-attr-cert 0 application/pkix-cert 0 diff --git a/conf/scores.d/rbl_group.conf b/conf/scores.d/rbl_group.conf index 8f6542ae5..96238adf9 100644 --- a/conf/scores.d/rbl_group.conf +++ b/conf/scores.d/rbl_group.conf @@ -29,15 +29,15 @@ symbols = { description = "Sender listed at https://www.dnswl.org, no trust"; } "RCVD_IN_DNSWL_LOW" { - weight = 0.0; + weight = -0.1; description = "Sender listed at https://www.dnswl.org, low trust"; } "RCVD_IN_DNSWL_MED" { - weight = 0.0; + weight = -0.2; description = "Sender listed at https://www.dnswl.org, medium trust"; } "RCVD_IN_DNSWL_HI" { - weight = 0.0; + weight = -0.5; description = "Sender listed at https://www.dnswl.org, high trust"; } |