diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-10-01 18:17:07 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-10-01 18:17:07 +0100 |
| commit | 647986d925162a8bd1ee18dde1b074e3edabb22d (patch) | |
| tree | f7ba7fe13865ce99f7490fd48de371140f1c8b05 /test/functional/configs | |
| parent | c9ecda5cf992d7b8742f3420bbd62dbc81eb3560 (diff) | |
| download | rspamd-647986d925162a8bd1ee18dde1b074e3edabb22d.tar.gz rspamd-647986d925162a8bd1ee18dde1b074e3edabb22d.zip | |
[Test] Fix and extend whitelist tests
Diffstat (limited to 'test/functional/configs')
| -rw-r--r-- | test/functional/configs/maps/domains.list | 6 | ||||
| -rw-r--r-- | test/functional/configs/whitelist.conf | 47 |
2 files changed, 12 insertions, 41 deletions
diff --git a/test/functional/configs/maps/domains.list b/test/functional/configs/maps/domains.list index f0b635852..04b0a9b12 100644 --- a/test/functional/configs/maps/domains.list +++ b/test/functional/configs/maps/domains.list @@ -1,3 +1,5 @@ example.com -cacophony.za.org -#other.com +cacophony.za.org both:1.0 +highsecure.ru bl:1.0 +rspamd.com wl:2.0 +#other.com
\ No newline at end of file diff --git a/test/functional/configs/whitelist.conf b/test/functional/configs/whitelist.conf index 9b8c3af63..7769f5cd4 100644 --- a/test/functional/configs/whitelist.conf +++ b/test/functional/configs/whitelist.conf @@ -3,16 +3,6 @@ dmarc {} whitelist { rules { - "BLACKLIST_DDS" = { - blacklist = true; - valid_dkim = true; - valid_dmarc = true; - valid_spf = true; - domains = [ - "${TESTDIR}/configs/maps/domains.list", - ]; - score = 3.0 - } "WHITELIST_DDS" = { valid_dkim = true; @@ -21,7 +11,8 @@ whitelist { domains = [ "${TESTDIR}/configs/maps/domains.list", ]; - score = -3.0 + score = -3.0; + inverse_symbol = "BLACKLIST_DDS"; } "WHITELIST_DKIM" = { @@ -30,16 +21,8 @@ whitelist { "${TESTDIR}/configs/maps/domains.list", ]; description = "Mail comes from the whitelisted domain and has a valid DKIM signature"; - score = -1.0 - } - - "BLACKLIST_DKIM" = { - blacklist = true; - valid_dkim = true; - domains = [ - "${TESTDIR}/configs/maps/domains.list", - ]; - score = 3.0 + score = -1.0; + inverse_symbol = "BLACKLIST_DKIM"; } "WHITELIST_SPF" = { @@ -48,16 +31,9 @@ whitelist { "${TESTDIR}/configs/maps/domains.list", ]; score = -1.0 + inverse_multiplier = 3.0 description = "Mail comes from the whitelisted domain and has a valid SPF policy"; - } - - "BLACKLIST_SPF" = { - blacklist = true; - valid_spf = true; - domains = [ - "${TESTDIR}/configs/maps/domains.list", - ]; - score = 3.0 + inverse_symbol = "BLACKLIST_SPF"; } "WHITELIST_DMARC_DKIM" = { @@ -68,6 +44,7 @@ whitelist { ]; score = -2.0; description = "Mail comes from the whitelisted domain and has valid DMARC and DKIM policies"; + inverse_symbol = "BLACKLIST_DMARC_DKIM"; } "WHITELIST_DMARC" = { @@ -77,15 +54,7 @@ whitelist { ]; score = -2.0; description = "Mail comes from the whitelisted domain and has valid DMARC policy"; - } - - "BLACKLIST_DMARC" = { - blacklist = true; - valid_dmarc = true; - domains = [ - "${TESTDIR}/configs/maps/domains.list", - ]; - score = 3.0; + inverse_symbol = "BLACKLIST_DMARC"; } "STRICT_DMARC" = { |