From: korgoth1 <vladislav.stakhov@gmail.com>
Date: Mon, 30 Sep 2019 17:59:51 +0000 (+0300)
Subject: [Test] Emailbl subdomain + Emailbl Replyto subdomain
X-Git-Tag: 2.0~85^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=671e0c51fd8f7b6e8ef7a6579fb4e03f9b165caf;p=thirdparty%2Frspamd.git

[Test] Emailbl subdomain + Emailbl Replyto subdomain
---

diff --git a/test/functional/cases/340_surbl.robot b/test/functional/cases/340_surbl.robot
index 87d02dd299..9fb4f4d788 100644
--- a/test/functional/cases/340_surbl.robot
+++ b/test/functional/cases/340_surbl.robot
@@ -103,6 +103,10 @@ 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 REPLY TO full adress
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/replyto.eml
   Should Contain  ${result.stdout}  RSPAMD_EMAILBL_FULL (
@@ -113,6 +117,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 bb4b97e1d4..983b6e94a7 100644
--- a/test/functional/configs/plugins.conf
+++ b/test/functional/configs/plugins.conf
@@ -544,6 +544,11 @@ options = {
           type = a;
           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;
diff --git a/test/functional/messages/emailbltext2.eml b/test/functional/messages/emailbltext2.eml
new file mode 100644
index 0000000000..164288b88d
--- /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/replytosubdomain.eml b/test/functional/messages/replytosubdomain.eml
new file mode 100644
index 0000000000..a87ec9ae80
--- /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