commit 805b573: [Test] WHITELIST_SURBL

[korgoth1]

Author: korgoth1
Date: 2019-09-09 22:26:10 +0300
URL: https://github.com/rspamd/rspamd/commit/805b573ad13ace5ca7b9b57ad1ad5047fc269825 (refs/pull/3032/head)

[Test] WHITELIST_SURBL


 CMakeLists.txt                        |   2 -
 lualib/lua_magic/heuristics.lua       | 264 ++++++++++++++++++++++++----------
 lualib/lua_magic/init.lua             |  17 ++-
 lualib/lua_magic/patterns.lua         |  17 ++-
 lualib/lua_magic/types.lua            |  20 +++
 lualib/lua_util.lua                   |  10 +-
 src/libmime/message.c                 | 235 +++++++++++++++---------------
 src/libmime/message.h                 |   2 +
 src/libserver/cfg_file.h              |   1 -
 src/libserver/cfg_rcl.c               |   6 -
 src/libserver/milter.c                |   5 -
 src/libutil/http_connection.c         |   8 ++
 src/libutil/util.c                    |  37 -----
 src/lua/lua_mimepart.c                |  32 ++++-
 src/lua/lua_task.c                    |  15 +-
 src/lua/lua_text.c                    |  28 ++++
 src/plugins/lua/mime_types.lua        | 146 ++++++++++---------
 src/plugins/lua/multimap.lua          |  23 ++-
 src/plugins/lua/ratelimit.lua         |  44 ++++--
 src/rspamd.h                          |   3 -
 test/functional/cases/340_surbl.robot |   1 +
 test/functional/configs/plugins.conf  |   2 +-
 22 files changed, 570 insertions(+), 348 deletions(-)

diff --combined test/functional/cases/340_surbl.robot
index ee80577cf,a0cc4f943..4e1558ecd
--- a/test/functional/cases/340_surbl.robot
+++ b/test/functional/cases/340_surbl.robot
@@@ -92,11 -92,6 +92,12 @@@ SURBL example.com encoded url in subjec
    Should Not Contain  ${result.stdout}  DBL_PHISH (
    Should Not Contain  ${result.stdout}  URIBL_BLACK (
  
 +WHITELIST
 +  ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/whitelist.eml
 +  Should Not Contain  ${result.stdout}  RSPAMD_URIBL (
 +  Should Not Contain  ${result.stdout}  DBL_SPAM (
++  Should Not Contain  ${result.stdout}  RSPAMD_URIBL_IMAGES (
 +
  *** Keywords ***
  Surbl Setup
    ${PLUGIN_CONFIG} =  Get File  ${TESTDIR}/configs/surbl.conf
diff --combined test/functional/configs/plugins.conf
index 839e14257,ac68ec5cb..cb5d50609
--- a/test/functional/configs/plugins.conf
+++ b/test/functional/configs/plugins.conf
@@@ -579,16 -579,6 +579,16 @@@ options = 
            type = a;
            replies = ["127.0.0.4", "127.0.0.11"];
          },
 +        {
-           name = "rspamd-test.com.test.uribl";
++          name = "uppht14nj4fsoycu3huctg9d5psx9je4.test.uribl";
 +          type = a;
 +          replies = ["127.0.0.2"];
 +        },
 +        {
 +          name = "rspamd-test.com.test2.uribl";
 +          type = a;
 +          replies = ["127.0.1.2"];
 +        },
          {
            name = "9.8.8.8.test4.uribl";
            type = a;