diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-11-05 17:26:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-05 17:26:29 +0000 |
| commit | fb454c9cdc366fd4ae3d98b557d29e2397ccfabc (patch) | |
| tree | de1f85b0e38723f2d03495aa9c22402454859813 | |
| parent | 598b67ccc50489063327146d204cc1ca90136d04 (diff) | |
| parent | a8a6aaa9724fdaf692e6a3cebbaf51f1b52291e4 (diff) | |
| download | rspamd-fb454c9cdc366fd4ae3d98b557d29e2397ccfabc.tar.gz rspamd-fb454c9cdc366fd4ae3d98b557d29e2397ccfabc.zip | |
Merge pull request #3138 from korgoth1/master
[Test] Surbl IDN + punycode
| -rw-r--r-- | test/functional/cases/340_surbl.robot | 16 | ||||
| -rw-r--r-- | test/functional/configs/plugins.conf | 20 | ||||
| -rw-r--r-- | test/functional/messages/url8.eml | 3 | ||||
| -rw-r--r-- | test/functional/messages/url9.eml | 3 | ||||
| -rw-r--r-- | test/lua/unit/test_tld.dat | 1 |
5 files changed, 42 insertions, 1 deletions
diff --git a/test/functional/cases/340_surbl.robot b/test/functional/cases/340_surbl.robot index 2531032b1..5137223bf 100644 --- a/test/functional/cases/340_surbl.robot +++ b/test/functional/cases/340_surbl.robot @@ -125,7 +125,21 @@ EMAILBL REPLY TO domain only 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 ( + Should Not Contain ${result.stdout} RSPAMD_EMAILBL_DOMAINONLY ( + +SURBL IDN domain + ${result} = Scan Message With Rspamc ${TESTDIR}/messages/url8.eml + Should Contain ${result.stdout} RSPAMD_URIBL + Should Contain ${result.stdout} DBL_SPAM + Should Not Contain ${result.stdout} DBL_PHISH + Should Not Contain ${result.stdout} URIBL_BLACK + +SURBL IDN Punycode domain + ${result} = Scan Message With Rspamc ${TESTDIR}/messages/url9.eml + Should Contain ${result.stdout} RSPAMD_URIBL + Should Contain ${result.stdout} DBL_SPAM + Should Not Contain ${result.stdout} DBL_PHISH + Should Not Contain ${result.stdout} URIBL_BLACK *** Keywords *** diff --git a/test/functional/configs/plugins.conf b/test/functional/configs/plugins.conf index f57314caa..1587ce584 100644 --- a/test/functional/configs/plugins.conf +++ b/test/functional/configs/plugins.conf @@ -540,6 +540,26 @@ options = { replies = ["127.0.0.2"]; }, { + name = "jhcszdsmo3wuj5mp8t38kdisdmr3ib3q.test.uribl"; + type = a; + replies = ["127.0.0.2"]; + }, + { + name = "g9ifs3q39oh5jwru94cj7ffaqd6rfyq6.test.uribl"; + type = a; + replies = ["127.0.0.2"]; + }, + { + name = "xn--80arbjktj.xn--p1ai.test2.uribl"; + type = a; + replies = ["127.0.1.2"]; + }, + { + name = "мойсайт.рф.test2.uribl"; + type = a; + replies = ["127.0.1.2"]; + }, + { name = "user.emailbl.com.test5.uribl"; type = a; replies = ["127.0.0.2"]; diff --git a/test/functional/messages/url8.eml b/test/functional/messages/url8.eml new file mode 100644 index 000000000..7d1358d88 --- /dev/null +++ b/test/functional/messages/url8.eml @@ -0,0 +1,3 @@ +Content-Type: text/plain + +http://мойсайт.рф
\ No newline at end of file diff --git a/test/functional/messages/url9.eml b/test/functional/messages/url9.eml new file mode 100644 index 000000000..b6091f29d --- /dev/null +++ b/test/functional/messages/url9.eml @@ -0,0 +1,3 @@ +Content-Type: text/plain + +http://xn--80arbjktj.xn--p1ai
\ No newline at end of file diff --git a/test/lua/unit/test_tld.dat b/test/lua/unit/test_tld.dat index 95fbae5a8..c1cd41723 100644 --- a/test/lua/unit/test_tld.dat +++ b/test/lua/unit/test_tld.dat @@ -3,3 +3,4 @@ org net рф za.org +xn--p1ai |