From 062f1a1150e2ec01be33a5d721f652cd160fb155 Mon Sep 17 00:00:00 2001 From: korgoth1 Date: Tue, 1 Oct 2019 19:12:44 +0300 Subject: [PATCH] [Test] Emailbl domainonly + Emailbl full adress with subdomain --- test/functional/cases/340_surbl.robot | 5 +++++ test/functional/configs/plugins.conf | 5 +++++ test/functional/configs/surbl.conf | 1 - test/functional/messages/emailbltext3.eml | 4 ++++ 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 test/functional/messages/emailbltext3.eml diff --git a/test/functional/cases/340_surbl.robot b/test/functional/cases/340_surbl.robot index 9fb4f4d78..2531032b1 100644 --- a/test/functional/cases/340_surbl.robot +++ b/test/functional/cases/340_surbl.robot @@ -107,6 +107,11 @@ EMAILBL full subdomain adress ${result} = Scan Message With Rspamc ${TESTDIR}/messages/emailbltext2.eml Should Contain ${result.stdout} RSPAMD_EMAILBL_FULL ( +EMAILBL full subdomain adress & domain only + ${result} = Scan Message With Rspamc ${TESTDIR}/messages/emailbltext3.eml + Should Contain ${result.stdout} RSPAMD_EMAILBL_DOMAINONLY (0.00)[baddomain.com:email] + Should Contain ${result.stdout} RSPAMD_EMAILBL_FULL (0.00)[user.subdomain.baddomain.com:email] + EMAILBL REPLY TO full adress ${result} = Scan Message With Rspamc ${TESTDIR}/messages/replyto.eml Should Contain ${result.stdout} RSPAMD_EMAILBL_FULL ( diff --git a/test/functional/configs/plugins.conf b/test/functional/configs/plugins.conf index 983b6e94a..f57314caa 100644 --- a/test/functional/configs/plugins.conf +++ b/test/functional/configs/plugins.conf @@ -554,6 +554,11 @@ options = { type = a; replies = ["127.0.0.2"]; }, + { + name = "user.subdomain.baddomain.com.test5.uribl"; + type = a; + replies = ["127.0.0.2"]; + }, { name = "example.com.test2.uribl"; type = a; diff --git a/test/functional/configs/surbl.conf b/test/functional/configs/surbl.conf index 5c244e257..1ebf2d97f 100644 --- a/test/functional/configs/surbl.conf +++ b/test/functional/configs/surbl.conf @@ -75,7 +75,6 @@ emails { rules { "RSPAMD_EMAILBL_FULL" { dnsbl = "test5.uribl"; - domain_only = false; replyto = true; } "RSPAMD_EMAILBL_DOMAINONLY" { diff --git a/test/functional/messages/emailbltext3.eml b/test/functional/messages/emailbltext3.eml new file mode 100644 index 000000000..414a0f51c --- /dev/null +++ b/test/functional/messages/emailbltext3.eml @@ -0,0 +1,4 @@ +Content-Type: text/plain + +user@baddomain.com +user@subdomain.baddomain.com \ No newline at end of file -- 2.39.5