[Test] Surbl IDN + punycode

diff --git a/test/functional/cases/340_surbl.robot b/test/functional/cases/340_surbl.robot
index 2531032b18632cbc4fe6a7b8af97aebf4c726dfe..5137223bf538c02d1086e5ef47c407e597dea595 100644 (file)
--- 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 f57314caa772f7352dca9237d8e1d8818c57a714..1587ce584b493c7c51c6fd4a1e5c76ba115588a1 100644 (file)
--- a/test/functional/configs/plugins.conf
+++ b/test/functional/configs/plugins.conf
@@ -539,6 +539,26 @@ options = {
           type = a;
           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;

diff --git a/test/functional/messages/url8.eml b/test/functional/messages/url8.eml
new file mode 100644 (file)
index 0000000..7d1358d
--- /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 (file)
index 0000000..b6091f2
--- /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 95fbae5a83a4f778d30795261076cc680984f936..c1cd41723c068b5577cfed5e3a4305b4645eca82 100644 (file)
--- a/test/lua/unit/test_tld.dat
+++ b/test/lua/unit/test_tld.dat
@@ -3,3 +3,4 @@ org
 net
 рф
 za.org
+xn--p1ai