diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-10-01 18:51:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-01 18:51:59 +0100 |
| commit | 08d584bea34a3cd11ae814e924eabeea26c80d65 (patch) | |
| tree | e28688adc6437ce5e7cf66fb262295fe63f9d3e9 | |
| parent | 61506d52797c8d64588570adda52c0d62698121d (diff) | |
| parent | 062f1a1150e2ec01be33a5d721f652cd160fb155 (diff) | |
| download | rspamd-08d584bea34a3cd11ae814e924eabeea26c80d65.tar.gz rspamd-08d584bea34a3cd11ae814e924eabeea26c80d65.zip | |
Merge pull request #3061 from korgoth1/master
[Test] Emailbl subdomain + Emailbl Replyto subdomain
| -rw-r--r-- | test/functional/cases/340_surbl.robot | 14 | ||||
| -rw-r--r-- | test/functional/configs/plugins.conf | 10 | ||||
| -rw-r--r-- | test/functional/configs/surbl.conf | 1 | ||||
| -rw-r--r-- | test/functional/messages/emailbltext2.eml | 3 | ||||
| -rw-r--r-- | test/functional/messages/emailbltext3.eml | 4 | ||||
| -rw-r--r-- | test/functional/messages/replytosubdomain.eml | 5 |
6 files changed, 36 insertions, 1 deletions
diff --git a/test/functional/cases/340_surbl.robot b/test/functional/cases/340_surbl.robot index 87d02dd29..2531032b1 100644 --- a/test/functional/cases/340_surbl.robot +++ b/test/functional/cases/340_surbl.robot @@ -103,6 +103,15 @@ EMAILBL full adress & domain only Should Contain ${result.stdout} RSPAMD_EMAILBL_FULL ( Should Contain ${result.stdout} RSPAMD_EMAILBL_DOMAINONLY ( +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 ( @@ -113,6 +122,11 @@ EMAILBL REPLY TO domain only Should Contain ${result.stdout} RSPAMD_EMAILBL_DOMAINONLY ( Should Not Contain ${result.stdout} RSPAMD_EMAILBL_FULL ( +EMAILBL REPLY TO full subdomain adress + ${result} = Scan Message With Rspamc ${TESTDIR}/messages/replytosubdomain.eml + Should Contain ${result.stdout} RSPAMD_EMAILBL_FULL ( + Should Not Contain ${result.stdout} RSPAMD_EMAILBL_DOMAINONLY ( + *** Keywords *** Surbl Setup diff --git a/test/functional/configs/plugins.conf b/test/functional/configs/plugins.conf index bb4b97e1d..f57314caa 100644 --- a/test/functional/configs/plugins.conf +++ b/test/functional/configs/plugins.conf @@ -545,11 +545,21 @@ options = { replies = ["127.0.0.2"]; }, { + name = "user.subdomain.emailbl.com.test5.uribl"; + type = a; + replies = ["127.0.0.2"]; + }, + { name = "baddomain.com.test6.uribl"; 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; replies = ["127.0.1.2"]; 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/emailbltext2.eml b/test/functional/messages/emailbltext2.eml new file mode 100644 index 000000000..164288b88 --- /dev/null +++ b/test/functional/messages/emailbltext2.eml @@ -0,0 +1,3 @@ +Content-Type: text/plain + +user@subdomain.emailbl.com
\ No newline at end of file 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 diff --git a/test/functional/messages/replytosubdomain.eml b/test/functional/messages/replytosubdomain.eml new file mode 100644 index 000000000..a87ec9ae8 --- /dev/null +++ b/test/functional/messages/replytosubdomain.eml @@ -0,0 +1,5 @@ +Reply-to: user@subdomain.emailbl.com +From: xxx@abrakadabra.com +Content-Type: text/plain + +salkdmaslkd
\ No newline at end of file |