Merge pull request #3281 from korgoth1/master

[Test] URL compose map

7 files changed, 49 insertions, 8 deletions

diff --git a/test/functional/cases/340_surbl.robot b/test/functional/cases/340_surbl.robot
index 8c7fcc3c1..81e30de1d 100644
--- a/test/functional/cases/340_surbl.robot
+++ b/test/functional/cases/340_surbl.robot
@@ -104,21 +104,21 @@ WHITELIST
   Should Not Contain  ${result.stdout}  DBL_SPAM (
   Should Not Contain  ${result.stdout}  RSPAMD_URIBL_IMAGES (
 
-EMAILBL full adress & domain only
+EMAILBL full address & domain only
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/emailbltext.eml
   Should Contain  ${result.stdout}  RSPAMD_EMAILBL_FULL (
   Should Contain  ${result.stdout}  RSPAMD_EMAILBL_DOMAINONLY (
 
-EMAILBL full subdomain adress
+EMAILBL full subdomain address
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/emailbltext2.eml
   Should Contain  ${result.stdout}  RSPAMD_EMAILBL_FULL (
 
-EMAILBL full subdomain adress & domain only
+EMAILBL full subdomain address & 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
+EMAILBL REPLY TO full address
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/replyto.eml
   Should Contain  ${result.stdout}  RSPAMD_EMAILBL_FULL (
   Should Not Contain  ${result.stdout}  RSPAMD_EMAILBL_DOMAINONLY (
@@ -128,7 +128,7 @@ 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
+EMAILBL REPLY TO full subdomain address
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/replytosubdomain.eml
   Should Contain  ${result.stdout}  RSPAMD_EMAILBL_FULL (
   Should Not Contain  ${result.stdout}  RSPAMD_EMAILBL_DOMAINONLY (
@@ -147,10 +147,15 @@ SURBL IDN Punycode domain
   Should Not Contain  ${result.stdout}  DBL_PHISH
   Should Not Contain  ${result.stdout}  URIBL_BLACK
 
-SURBL html entity &shy
+SURBL html entity&shy
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/url10.eml
   Should Contain  ${result.stdout}  RSPAMD_URIBL
 
+SURBL url compose map
+  ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/url11.eml
+  Should Contain  ${result.stdout}  BAD_SUBDOMAIN (0.00)[very.dirty.sanchez.com:url]
+  Should Not Contain  ${result.stdout}  not.dirty.sanchez.com
+
 *** Keywords ***
 Surbl Setup
   ${PLUGIN_CONFIG} =  Get File  ${TESTDIR}/configs/surbl.conf
diff --git a/test/functional/configs/maps/url_compose_map.list b/test/functional/configs/maps/url_compose_map.list
new file mode 100644
index 000000000..06868b288
--- /dev/null
+++ b/test/functional/configs/maps/url_compose_map.list
@@ -0,0 +1,2 @@
+*.dirty.sanchez.com
+!not.dirty.sanchez.com
\ No newline at end of file
diff --git a/test/functional/configs/maps/url_compose_map_for_mails.list b/test/functional/configs/maps/url_compose_map_for_mails.list
new file mode 100644
index 000000000..2abdc5e32
--- /dev/null
+++ b/test/functional/configs/maps/url_compose_map_for_mails.list
@@ -0,0 +1 @@
+!very.clean.exclude.com
\ No newline at end of file
diff --git a/test/functional/configs/plugins.conf b/test/functional/configs/plugins.conf
index 025f6c55f..817b5e4db 100644
--- a/test/functional/configs/plugins.conf
+++ b/test/functional/configs/plugins.conf
@@ -665,6 +665,21 @@ options = {
           type = a;
           replies = ["127.0.0.3"];
         },
+        {
+          name = "very.dirty.sanchez.com.test7.uribl";
+          type = a;
+          replies = ["127.0.0.2"];
+        },
+        {
+          name = "clean.dirty.sanchez.com.test7.uribl";
+          type = a;
+          replies = ["127.0.0.2"];
+        },
+        {
+          name = "not.dirty.sanchez.com.test7.uribl";
+          type = a;
+          replies = ["127.0.0.2"];
+        },
         # TODO: add IPv6 tests
         ];
   }
diff --git a/test/functional/configs/surbl.conf b/test/functional/configs/surbl.conf
index 1ebf2d97f..a2565784e 100644
--- a/test/functional/configs/surbl.conf
+++ b/test/functional/configs/surbl.conf
@@ -1,7 +1,7 @@
 surbl {
     "whitelist" = [
     "rspamd-test.com"
-  ]
+  ];
   rules {
     "RSPAMD_URIBL" {
       suffix = "test.uribl";
@@ -64,7 +64,18 @@ EOD;
 end
 EOD;
     }
-
+    "BAD_SUBDOMAIN" {
+      suffix = "test7.uribl";
+      url_compose_map = "${TESTDIR}/configs/maps/url_compose_map.list";
+      check_dkim = true;
+      check_emails = false;
+    }
+    "BAD_SUBDOMAIN_IN_MAIL" {
+      suffix = "test8.uribl";
+      url_compose_map = "${TESTDIR}/configs/maps/url_compose_map_for_mails.list";
+      check_dkim = true;
+      check_emails = true;
+    }
   }
 }
 
diff --git a/test/functional/messages/url11.eml b/test/functional/messages/url11.eml
new file mode 100644
index 000000000..82ddbf77d
--- /dev/null
+++ b/test/functional/messages/url11.eml
@@ -0,0 +1,4 @@
+Content-Type: text/plain
+
+http://clean.dirty.sanchez.com
+http://not.dirty.sanchez.com
\ No newline at end of file
diff --git a/test/functional/messages/url12.eml b/test/functional/messages/url12.eml
new file mode 100644
index 000000000..b8467f680
--- /dev/null
+++ b/test/functional/messages/url12.eml
@@ -0,0 +1,3 @@
+Content-Type: text/plain
+
+http://not.dirty.sanchez.com
\ No newline at end of file