From: Carsten Rosenberg <c.rosenberg@heinlein-support.de>
Date: Sun, 20 Jan 2019 13:22:19 +0000 (+0100)
Subject: [Minor] lua_scanners - icap container error handling
X-Git-Tag: 1.9.0~288^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6fd22b1aa8bbe08598709bcdcfbdc709daac6d2d;p=rspamd.git

[Minor] lua_scanners - icap container error handling
---

diff --git a/lualib/lua_scanners/icap.lua b/lualib/lua_scanners/icap.lua
index 6a16dea73..300243337 100644
--- a/lualib/lua_scanners/icap.lua
+++ b/lualib/lua_scanners/icap.lua
@@ -96,15 +96,21 @@ local function icap_check(task, content, digest, rule)
         X-Virus-ID: Troj/DocDl-OYC
       ]] --
 
-      local pattern_symbols
-      local match
-
       if icap_headers['X-Infection-Found'] ~= nil then
-        pattern_symbols = "(Type%=%d; .* Threat%=)(.*)([;]+)"
-        match = string.gsub(icap_headers['X-Infection-Found'], pattern_symbols, "%2")
-        lua_util.debugm(rule.name, task,
-            '%s: icap X-Infection-Found: %s', rule.log_prefix, match)
-        table.insert(threat_string, match)
+        local _,_,icap_type,_,icap_threat =
+          icap_headers['X-Infection-Found']:find("Type=(.-); Resolution=(.-); Threat=(.-);$")
+
+        if not icap_type or icap_type == 2 then
+          -- error returned
+          lua_util.debugm(rule.name, task,
+              '%s: icap error X-Infection-Found: %s', rule.log_prefix, icap_threat)
+          common.yield_result(task, rule, icap_threat, 0, 'fail')
+        else
+          lua_util.debugm(rule.name, task,
+              '%s: icap X-Infection-Found: %s', rule.log_prefix, icap_threat)
+          table.insert(threat_string, icap_threat)
+        end
+
       elseif icap_headers['X-Virus-ID'] ~= nil then
         lua_util.debugm(rule.name, task,
             '%s: icap X-Virus-ID: %s', rule.log_prefix, icap_headers['X-Virus-ID'])