aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Rosenberg <c.rosenberg@heinlein-support.de>2020-05-29 22:43:59 +0200
committerCarsten Rosenberg <c.rosenberg@heinlein-support.de>2020-05-29 22:43:59 +0200
commitdb18212e766e805410ce2003f8d7229c5934ce7e (patch)
tree29f82875c53692058716520a296a94a08c3f699f
parent5de369678bd0b1314bdbf9ac056042ba4655cf5e (diff)
downloadrspamd-db18212e766e805410ce2003f8d7229c5934ce7e.tar.gz
rspamd-db18212e766e805410ce2003f8d7229c5934ce7e.zip
[Minor] lua_scanners - fix detected parts_match
-rw-r--r--lualib/lua_scanners/common.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/lualib/lua_scanners/common.lua b/lualib/lua_scanners/common.lua
index a162828fb..67952923d 100644
--- a/lualib/lua_scanners/common.lua
+++ b/lualib/lua_scanners/common.lua
@@ -399,7 +399,10 @@ local function check_parts_match(task, rule)
-- check detected content type (libmagic) regex matching
if detected_ext then
local magic = lua_magic_types[detected_ext] or {}
- if match_filter(task, magic.ct, rule.mime_parts_filter_regex) then
+ if match_filter(task, rule, detected_ext, rule.mime_parts_filter_ext, 'ext') then
+ lua_util.debugm(rule.name, task, '%s: detected extension matched: |%s|', rule.log_prefix, detected_ext)
+ return true
+ elseif magic.ct and match_filter(task, rule, magic.ct, rule.mime_parts_filter_regex, 'regex') then
lua_util.debugm(rule.name, task, '%s: regex detected libmagic content-type: %s',
rule.log_prefix, magic.ct)
return true