Merge pull request #3023 from korgoth1/master

[Test] Uribl in mail address
rspamd · Aug 30, 2019 · 0c9d6fa · 0c9d6fa
2 parents 2f98824 + b8f697f
commit 0c9d6fa
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 1 deletion.
diff --git a/test/functional/cases/340_surbl.robot b/test/functional/cases/340_surbl.robot
@@ -60,6 +60,24 @@ SURBL Example.com domain image false
   Should Not Contain  ${result.stdout}  DBL_PHISH (
   Should Not Contain  ${result.stdout}  URIBL_BLACK (
 
+SURBL @example.com mail html
+  ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/mailadr.eml
+  Should Contain  ${result.stdout}  URIBL_IN_MAIL (
+  Should Not Contain  ${result.stdout}  RSPAMD_URIBL
+  Should Not Contain  ${result.stdout}  DBL_SPAM (
+  Should Not Contain  ${result.stdout}  RSPAMD_URIBL (
+  Should Not Contain  ${result.stdout}  DBL_PHISH (
+  Should Not Contain  ${result.stdout}  URIBL_BLACK (
+
+SURBL @example.com mail text
+  ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/mailadr2.eml
+  Should Contain  ${result.stdout}  URIBL_IN_MAIL (
+  Should Not Contain  ${result.stdout}  RSPAMD_URIBL
+  Should Not Contain  ${result.stdout}  DBL_SPAM (
+  Should Not Contain  ${result.stdout}  RSPAMD_URIBL (
+  Should Not Contain  ${result.stdout}  DBL_PHISH (
+  Should Not Contain  ${result.stdout}  URIBL_BLACK (
+
 *** Keywords ***
 Surbl Setup
   ${PLUGIN_CONFIG} =  Get File  ${TESTDIR}/configs/surbl.conf

diff --git a/test/functional/configs/plugins.conf b/test/functional/configs/plugins.conf
@@ -544,6 +544,11 @@ options = {
           type = a;
           replies = ["127.0.1.2"];
         },
+        {
+          name = "user.example.com.test2.uribl";
+          type = a;
+          replies = ["127.0.1.5"];
+        },
         {
           name = "example.net.test2.uribl";
           type = a;

diff --git a/test/functional/configs/surbl.conf b/test/functional/configs/surbl.conf
@@ -1,4 +1,3 @@
-
 surbl {
   rules {
     "RSPAMD_URIBL" {
@@ -64,5 +63,14 @@ EOD;
 end
 EOD;
     }
+    "URIBL_IN_MAIL" {
+      suffix = "test2.uribl";
+      no_ip = true;
+      check_emails = true;
+
+      ips = {
+      URIBL_IN_MAIL = "127.0.1.5";
+      }
+      }
   }
 }
diff --git a/test/functional/messages/mailadr.eml b/test/functional/messages/mailadr.eml
@@ -0,0 +1,4 @@
+Content-Type: text/html
+
+helo
+<a href="mailto:user@example.com">Send email</a>
diff --git a/test/functional/messages/mailadr2.eml b/test/functional/messages/mailadr2.eml
@@ -0,0 +1,4 @@
+Content-Type: text/plain
+
+hello
+user@example.com