aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2019-03-10 21:15:24 +0000
committerGitHub <noreply@github.com>2019-03-10 21:15:24 +0000
commit71631e8a3053b63d728eda53abec27fcbc7afd2c (patch)
treeb5be8cdfd73e27c7b77fb2ad36d149511f3af7ff /conf
parentb53bea90eb9593530258eb05f7066f53b050410e (diff)
parent66067de1fbcc1ef2bfdd0935f6ac146aba9e5158 (diff)
downloadrspamd-71631e8a3053b63d728eda53abec27fcbc7afd2c.tar.gz
rspamd-71631e8a3053b63d728eda53abec27fcbc7afd2c.zip
Merge pull request #2616 from heraklit256/uribl-spamhaus
also query resolved IPs against Spamhaus ZEN
Diffstat (limited to 'conf')
-rw-r--r--conf/modules.d/surbl.conf7
-rw-r--r--conf/scores.d/surbl_group.conf22
2 files changed, 22 insertions, 7 deletions
diff --git a/conf/modules.d/surbl.conf b/conf/modules.d/surbl.conf
index 6973e7bef..f8c046aa9 100644
--- a/conf/modules.d/surbl.conf
+++ b/conf/modules.d/surbl.conf
@@ -87,12 +87,15 @@ EOD;
}
}
- "SBL_URIBL" {
- suffix = "sbl.spamhaus.org";
+ "SPAMHAUS_ZEN_URIBL" {
+ suffix = "zen.spamhaus.org";
resolve_ip = true;
ips {
URIBL_SBL = "127.0.0.2";
URIBL_SBL_CSS = "127.0.0.3";
+ URIBL_XBL = ["127.0.0.4", "127.0.0.5", "127.0.0.6", "127.0.0.7"];
+ URIBL_PBL = ["127.0.0.10", "127.0.0.11"];
+ URIBL_DROP = "127.0.0.9";
}
}
diff --git a/conf/scores.d/surbl_group.conf b/conf/scores.d/surbl_group.conf
index 9605df5c0..61d0da5cc 100644
--- a/conf/scores.d/surbl_group.conf
+++ b/conf/scores.d/surbl_group.conf
@@ -146,20 +146,32 @@ symbols = {
description = "uribl.com grey url";
one_shot = true;
}
- "SBL_URIBL" {
+ "SPAMHAUS_ZEN_URIBL" {
weight = 0.0;
- description = "SBL URIBL: Filtered result";
+ description = "Spamhaus ZEN URIBL: Filtered result";
}
"URIBL_SBL" {
weight = 6.5;
- description = "Spamhaus SBL URIBL";
+ description = "A domain in the message body resolves to an IP listed in Spamhaus SBL";
}
"URIBL_SBL_CSS" {
weight = 6.5;
- description = "Spamhaus SBL CSS URIBL";
+ description = "A domain in the message body resolves to an IP listed in Spamhaus SBL CSS";
+ }
+ "URIBL_XBL" {
+ weight = 6.5;
+ description = "A domain in the message body resolves to an IP listed in Spamhaus XBL";
+ }
+ "URIBL_PBL" {
+ weight = 0.01;
+ description = "A domain in the message body resolves to an IP listed in Spamhaus PBL";
+ }
+ "URIBL_DROP" {
+ weight = 8.0;
+ description = "A domain in the message body resolves to an IP listed in Spamhaus DROP";
}
"RBL_SARBL_BAD" {
weight = 2.5;
- description = "A domain listed in the mail is blacklisted in SARBL";
+ description = "A domain in the message body is blacklisted in SARBL";
}
}