aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2018-09-28 19:54:13 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2018-09-29 12:43:13 +0100
commitdcc7e9ad2b201f80b512d49aba79baac87eee675 (patch)
tree801ab5b07d9851ed2299e20bc24c3f9816b3c72e
parent181c7004141a4f07e276ba8dcf0ea98ee9250993 (diff)
downloadrspamd-dcc7e9ad2b201f80b512d49aba79baac87eee675.tar.gz
rspamd-dcc7e9ad2b201f80b512d49aba79baac87eee675.zip
[Conf] Specify whitelist symbols group
-rw-r--r--conf/groups.conf6
-rw-r--r--conf/modules.d/whitelist.conf10
-rw-r--r--conf/scores.d/whitelist_group.conf54
3 files changed, 65 insertions, 5 deletions
diff --git a/conf/groups.conf b/conf/groups.conf
index 04b777e6b..02e714174 100644
--- a/conf/groups.conf
+++ b/conf/groups.conf
@@ -59,6 +59,12 @@ group "policies" {
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/policies_group.conf"
}
+group "whitelist" {
+ .include "$CONFDIR/scores.d/whitelist_group.conf"
+ .include(try=true; priority=1; duplicate=merge) "$LOCAL_CONFDIR/local.d/whitelist_group.conf"
+ .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/whitelist_group.conf"
+}
+
group "surbl" {
.include "$CONFDIR/scores.d/surbl_group.conf"
.include(try=true; priority=1; duplicate=merge) "$LOCAL_CONFDIR/local.d/surbl_group.conf"
diff --git a/conf/modules.d/whitelist.conf b/conf/modules.d/whitelist.conf
index 0b19002c8..ddf5bdad8 100644
--- a/conf/modules.d/whitelist.conf
+++ b/conf/modules.d/whitelist.conf
@@ -22,7 +22,7 @@ whitelist {
"fallback+file://${CONFDIR}/spf_whitelist.inc"
];
score = -1.0
- description = "Mail comes from the whitelisted domain and has a valid SPF policy";
+ inverse_symbol = "BLACKLIST_SPF";
}
"WHITELIST_DKIM" = {
@@ -31,8 +31,8 @@ whitelist {
"${DBDIR}/dkim_whitelist.inc.local",
"fallback+file://${CONFDIR}/dkim_whitelist.inc"
];
- description = "Mail comes from the whitelisted domain and has a valid DKIM signature";
- score = -1.0
+ score = -1.0;
+ inverse_symbol = "BLACKLIST_DKIM";
}
"WHITELIST_SPF_DKIM" = {
valid_spf = true;
@@ -43,7 +43,7 @@ whitelist {
"fallback+file://${CONFDIR}/spf_dkim_whitelist.inc"
];
score = -3.0;
- description = "Mail comes from the whitelisted domain and has valid SPF and DKIM policies";
+ inverse_symbol = "BLACKLIST_SPF_DKIM";
}
"WHITELIST_DMARC" = {
valid_dmarc = true;
@@ -53,7 +53,7 @@ whitelist {
"fallback+file://${CONFDIR}/dmarc_whitelist.inc"
];
score = -7.0;
- description = "Mail comes from the whitelisted domain and has valid DMARC and DKIM policies";
+ inverse_symbol = "BLACKLIST_DMARC";
}
}
diff --git a/conf/scores.d/whitelist_group.conf b/conf/scores.d/whitelist_group.conf
new file mode 100644
index 000000000..900aa3680
--- /dev/null
+++ b/conf/scores.d/whitelist_group.conf
@@ -0,0 +1,54 @@
+# Whitelist rules scores
+#
+# Please don't modify this file as your changes might be overwritten with
+# the next update.
+#
+# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
+# parameters defined on the top level
+#
+# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
+# parameters defined on the top level
+#
+# For specific modules or configuration you can also modify
+# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+#
+# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+
+
+max_score = 10.0;
+
+symbols = {
+ "WHITELIST_SPF" {
+ weight = -1.0;
+ description = "Mail comes from the whitelisted domain and has a valid SPF policy";
+ }
+ "BLACKLIST_SPF" {
+ weight = 1.0;
+ description = "Mail comes from the whitelisted domain and has no valid SPF policy";
+ }
+ "WHITELIST_DKIM" {
+ weight = -1.0;
+ description = "Mail comes from the whitelisted domain and has a valid DKIM signature";
+ }
+ "BLACKLIST_DKIM" {
+ weight = 2.0;
+ description = "Mail comes from the whitelisted domain and has non-valid DKIM signature";
+ }
+ "WHITELIST_SPF_DKIM" {
+ weight = -3.0;
+ description = "Mail comes from the whitelisted domain and has valid SPF and DKIM policies";
+ }
+ "BLACKLIST_SPF_DKIM" {
+ weight = 3.0;
+ description = "Mail comes from the whitelisted domain and has no valid SPF policy or a bad DKIM signature";
+ }
+ "WHITELIST_DMARC" {
+ weight = -7.0;
+ description = "Mail comes from the whitelisted domain and has valid DMARC and DKIM policies";
+ }
+ "BLACKLIST_DMARC" {
+ weight = 6.0;
+ description = "Mail comes from the whitelisted domain and has valid failed DMARC and DKIM policies";
+ }
+}