From: Arne Fahrenwalde <macgeneral@macgeneral.de>
Date: Sun, 28 Jan 2018 00:48:46 +0000 (+0100)
Subject: [Fix] F-PROT Antivirus infection string for all known occurences
X-Git-Tag: 1.7.0~228^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03cd15ca59b6d6e20537fb17ed9cf1b296fd78f5;p=thirdparty%2Frspamd.git

[Fix] F-PROT Antivirus infection string for all known occurences

both <infected: ...> and <contains infected object: ...> are possible
---

diff --git a/src/plugins/lua/antivirus.lua b/src/plugins/lua/antivirus.lua
index 33c1d738ec..c35b8cfd61 100644
--- a/src/plugins/lua/antivirus.lua
+++ b/src/plugins/lua/antivirus.lua
@@ -410,7 +410,7 @@ local function fprot_check(task, rule)
             rspamd_logger.infox(task, '%s [%s]: message is clean', rule['symbol'], rule['type'])
           end
         else
-          local vname = string.match(data, '^1 <contains?%s?infected%s?objects?: (.-)>')
+          local vname = string.match(data, '^1 <.*infected.*: (.-)>')
           if not vname then
             rspamd_logger.errx(task, 'Unhandled response: %s', data)
           else