Merge pull request #3027 from korgoth1/master

[Test] fix uribl in mail address

test/functional/cases/340_surbl.robot

@@ -62,22 +62,23 @@ SURBL Example.com domain image false
 
 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 Contain  ${result.stdout}  RSPAMD_URIBL (
+  Should Contain  ${result.stdout}  DBL_SPAM (
+  Should Contain  ${result.stdout}  example.com:email
+  Should Not Contain  ${result.stdout}  RSPAMD_URIBL_IMAGES (
   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 Contain  ${result.stdout}  RSPAMD_URIBL (
+  Should Contain  ${result.stdout}  DBL_SPAM (
+  Should Contain  ${result.stdout}  example.com:email
+  Should Not Contain  ${result.stdout}  RSPAMD_URIBL_IMAGES (
   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

test/functional/configs/surbl.conf

@@ -53,7 +53,7 @@ EOD;
     "RSPAMD_URIBL_IMAGES" {
       suffix = "test.uribl";
       check_dkim = true;
-      check_emails = true;
+      check_emails = false;
       images = true;
       process_script =<<EOD
   function(url, suffix)
@@ -63,14 +63,5 @@ EOD;
 end
 EOD;
     }
-    "URIBL_IN_MAIL" {
-      suffix = "test2.uribl";
-      no_ip = true;
-      check_emails = true;
-
-      ips = {
-      URIBL_IN_MAIL = "127.0.1.5";
-      }
-      }
   }
 }