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
HcmV?d00001

diff --git a/test/functional/cases/340_surbl.robot b/test/functional/cases/340_surbl.robot
index d5391af07..a533afdf5 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 85074955c..967c170ae 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 000000000..6ae708890
--- /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
zcmb_b&2G~`5T3RBPf7|!NWF8gKx$q95FAj21d(t-pdu6*dy_czpS<I=mC{oyeoj0X
zSKfpNfceI0S~$mv$1}6DJKxNF>;K-~`t|ekr<mrCC*NoCx+fwM`5VfJjuyJ1BXi~V
z=*UAr;?bq}S19r6Qi50EJPcOkg!GR*{TQdh^yjaei1O9YP&OO-LUiuYH_dUpLG=Tg
zdGwvAkQmY!Ph)&yLldLYqnS?^9+_*Gf77L4E({r|p@q_4)MzC6uDtHH2uUkoE@&Q!
zwSEA}9fa6=YU@FqmCgoYQ@gabSW>4u5WDwIf?aQ#?K_T+$K|wFyDG|)QOa|z$JTLg
z*c36RWf5h)hSRK<G<kkDI8L+7*89~N15{#%QIqi?w>&Nr&4w0|(N02L)No4-so}o@
z5F8+mb#po@nw(d~9@bHAuZw6CEWe0tNfl*Loe#!Qkw|6Q%(jN~6yN}c!HIrZ*agZc
z<8|>JzC3vTDtvvVzkMM(Ht3N`tPl+d;R|tUh%(y&si_MHS?Xw7MsQQj$Av6PA~IdS
zV>Z36ziW0)jKrWiO2OBC6u~+tp}Vm5$3r?dG;7)H5&JY*!3c%0;4Btab)@fwzHdJK
za|<MVjV9~3BMW{bN#CLJlSi>gePAlh?}#GV<>r7WS9by+`z=QhSvnm;ZS!(^lj;~z
z74dla96@*D%tl31?TM=J$pjmsD>2H-7CQBlI%O+8k{GT-P)nhXELUlw5qdw>8L>T0
znQ=&MN2z052iO^Qu?;m3!yS=Yj@|=ZSt?C7<$T3F5PbK<a9bkC+%<b<M>rCItRWz3
nG2wk^=tc;Fg=j_#Pn1?$Dm)~9oR>+H*{6C%;OH3nd7bWG2^vog

literal 0
HcmV?d00001

-- 
2.39.5