From a8f11e58cb9c7c668ac8ad4bb5dbfebb650ceda0 Mon Sep 17 00:00:00 2001
From: korgoth1 <vladislav.stakhov@gmail.com>
Date: Fri, 30 Aug 2019 16:34:49 +0300
Subject: [PATCH] test uribll in image

---
 .../cases/210_clickhouse/clickhouse.pyc          | Bin 0 -> 4539 bytes
 test/functional/cases/340_surbl.robot            |   8 ++++++++
 test/functional/configs/surbl.conf               |  14 ++++++++++++++
 test/functional/messages/urlimage.eml            |   5 +++++
 test/functional/util/dummy_killer.pyc            | Bin 0 -> 1553 bytes
 5 files changed, 27 insertions(+)
 create mode 100644 test/functional/cases/210_clickhouse/clickhouse.pyc
 create mode 100644 test/functional/messages/urlimage.eml
 create mode 100644 test/functional/util/dummy_killer.pyc

diff --git a/test/functional/cases/210_clickhouse/clickhouse.pyc b/test/functional/cases/210_clickhouse/clickhouse.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e2b7d5f17971934d564e8388a76d281e4f34794e
GIT binary patch
literal 4539
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

literal 0
Hc-jL100001

diff --git a/test/functional/cases/340_surbl.robot b/test/functional/cases/340_surbl.robot
index d5391af07d..a533afdf50 100644
--- a/test/functional/cases/340_surbl.robot
+++ b/test/functional/cases/340_surbl.robot
@@ -52,6 +52,14 @@ SURBL Example.ru ZEN domain
   Should Not Contain  ${result.stdout}  DBL_PHISH (
   Should Not Contain  ${result.stdout}  URIBL_BLACK (
 
+SURBL Example.com domain image false
+  ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/urlimage.eml
+  Should Contain  ${result.stdout}  RSPAMD_URIBL_IMAGES
+  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/surbl.conf b/test/functional/configs/surbl.conf
index 85074955c4..967c170ae2 100644
--- a/test/functional/configs/surbl.conf
+++ b/test/functional/configs/surbl.conf
@@ -5,6 +5,7 @@ surbl {
       suffix = "test.uribl";
       check_dkim = true;
       check_emails = true;
+      images = false;
       process_script =<<EOD
 function(url, suffix)
   local cr = require "rspamd_cryptobox_hash"
@@ -50,5 +51,18 @@ EOD;
         URIBL_DROP = "127.0.0.9";
       }
     }
+    "RSPAMD_URIBL_IMAGES" {
+      suffix = "test.uribl";
+      check_dkim = true;
+      check_emails = true;
+      images = true;
+      process_script =<<EOD
+  function(url, suffix)
+    local cr = require "rspamd_cryptobox_hash"
+    local h = cr.create(url):base32():sub(1, 32)
+    return string.format("%s.%s", h, suffix)
+end
+EOD;
+    }
   }
 }
\ No newline at end of file
diff --git a/test/functional/messages/urlimage.eml b/test/functional/messages/urlimage.eml
new file mode 100644
index 0000000000..6ae7088904
--- /dev/null
+++ b/test/functional/messages/urlimage.eml
@@ -0,0 +1,5 @@
+Content-Type: text/html
+
+helo
+<body text="#000000" bgcolor="#FFFFFF">
+    <p><img src="https://example.com" alt=""moz-do-not-send="false" width="326" height="326" border="0"></a></p>
diff --git a/test/functional/util/dummy_killer.pyc b/test/functional/util/dummy_killer.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..55e7bac2ff1cfc9ff2171f24adb9a5a3c64b3c65
GIT binary patch
literal 1553
zc-pN~&2AGx4ED@6BrORk1R>?lAp)uU0#LyLRY(wtEeI5Zq9r>?Hr+q%dec@)PpP1s
zcrdQK2@e3a_a`amBpJ)`c<k>Re`EdW9Q^+E^~(gxkEZp4R`#5XM?VDtz^L{Wj8x@o
z7-@Dq4c8Rk1J8nMN^WrQbg)Mi{J-=WPPi)nwaS$($b45YRh;?_;7Y@d^f+rl`WRLk
zegH(21Cpa9#{yKaP+~Q#ELdw$n~=2~5-@88ifR^6hBZe;tH&trk)gH(W({Q~?+wLb
zn^R1>H0gK}#F-iJ*<$NXy(PiygpB=xBALAmjxu!5=JC=_v&0R(nUAGsqsh>o=FtTG
zIC29!M?bK=JPa?#XMPZv^eDMR2IZNln+G@!4bEdvx@kc!H>tNd+$}i#M?j$J8md2w
z@(>&3PE$8D8xlo>-IM50EjMt}a6ES-kAm$D2mgY>F&LD&#F42{x&b!HJ$-%h@{RMh
z^54HAzfqNxX*x{7;h4i!9WJn8U2LdbvnmvUc~Zt2m54xft+v|NU8|>hYNAS+H!Hb+
zX0kFTk~>NC=M%V6uqvdh0WB6RjgSP(n&pj#jPxVT^xdahuR!zU7EOL5wZ6H@P_Fm<
z>8+<M61iV=r(QR(Ia3HlG{Pp%WC*DV<K?#0`LYui=eySk-_9g3Zj>kejXDOcs%xB>
zNTz<C`e;xt5>uyBX?JEY@jc0q_bEXa&4rKH5-Kx4Lwcfo(&_RsW;AsUYptkiXQ#yW
zE6iiU_mHa}2(<^QuMSBg0|x3aL?PomV#BxLu)v&t4X-vkg~yGbg|U|h=2)Hx2il6h
Hy50Q;2^vog

literal 0
Hc-jL100001

-- 
2.47.3