commit 31dec45: [Test] SURBL resolve ip

[korgoth1]

Author: korgoth1
Date: 2020-01-10 18:42:35 +0300
URL: https://github.com/rspamd/rspamd/commit/31dec457f2c1eca1d364fb22f170f218cd72c8ba

[Test] SURBL resolve ip


 conf/maps.d/external_ip_spf.inc       |  1 -
 lualib/lua_content/pdf.lua            |  5 +-
 rules/misc.lua                        | 13 +++++
 src/libmime/mime_encoding.c           | 32 +++++++------
 src/libserver/html.c                  | 47 +++++++++++++++---
 src/libserver/url.c                   | 89 ++++++++++++++++++++++++-----------
 src/lua/lua_html.c                    |  2 +-
 src/lua/lua_util.c                    |  7 ++-
 src/plugins/lua/spf.lua               |  5 --
 src/worker.c                          |  2 +-
 test/functional/cases/340_surbl.robot |  6 +++
 test/functional/configs/dmarc.conf    |  4 +-
 test/lua/unit/url.lua                 | 18 +++----
 13 files changed, 160 insertions(+), 71 deletions(-)

diff --combined test/functional/cases/340_surbl.robot
index 71bd4285a,71bd4285a..962bd30f9
--- a/test/functional/cases/340_surbl.robot
+++ b/test/functional/cases/340_surbl.robot
@@@ -11,6 -11,6 +11,12 @@@ ${RSPAMD_SCOPE}  Suit
  ${URL_TLD}      ${TESTDIR}/../lua/unit/test_tld.dat
  
  *** Test Cases ***
++SURBL resolve ip
++  ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/url7.eml
++  Should Contain  ${result.stdout}  URIBL_SBL_CSS (1.00)[example.ru
++  Should Contain  ${result.stdout}  URIBL_XBL (1.00)[example.ru
++  Should Contain  ${result.stdout}  URIBL_PBL (1.00)[example.ru
++
  SURBL Example.com domain
    ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/url4.eml
    Should Contain  ${result.stdout}  RSPAMD_URIBL
diff --combined test/functional/configs/dmarc.conf
index dac106cc2,08a542c70..644fff0d5
--- a/test/functional/configs/dmarc.conf
+++ b/test/functional/configs/dmarc.conf
@@@ -1,2 -1,4 +1,4 @@@
  dmarc { }
- spf { }
+ spf {
 -	external_relay = 192.168.1.1;
++		external_relay = 192.168.1.1;
+ }