From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 14 May 2020 09:33:54 +0000 (+0100)
Subject: Merge pull request #3368 from HeinleinSupport/oletools_rework
X-Git-Tag: 2.6~428
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b9a659c5d01a92d124344d62dff70da431c6443c;p=rspamd.git

Merge pull request #3368 from HeinleinSupport/oletools_rework

lua_scanner - oletools / common rework
---

b9a659c5d01a92d124344d62dff70da431c6443c
diff --cc lualib/lua_scanners/common.lua
index 60e5c2cdf,34f83b6bd..a162828fb
--- a/lualib/lua_scanners/common.lua
+++ b/lualib/lua_scanners/common.lua
@@@ -411,16 -404,17 +408,17 @@@ local function check_parts_match(task, 
        -- check filenames in archives
        if p:is_archive() then
          local arch = p:get_archive()
 -        local filelist = arch:get_files_full()
 +        local filelist = arch:get_files_full(1000)
          for _,f in ipairs(filelist) do
            ext,ext2 = gen_extension(f.name)
-           if match_filter(task, ext, rule.mime_parts_filter_ext)
-             or match_filter(task, ext2, rule.mime_parts_filter_ext) then
-             lua_util.debugm(rule.name, task, '%s: extension matched in archive: %s', rule.log_prefix, ext)
-             extension_check = true
-           end
-           if match_filter(task, f.name, rule.mime_parts_filter_regex) then
-             content_type_check = true
+           if match_filter(task, rule, ext, rule.mime_parts_filter_ext, 'ext')
+               or match_filter(task, rule, ext2, rule.mime_parts_filter_ext, 'ext') then
+             lua_util.debugm(rule.name, task, '%s: extension matched in archive: |%s|%s|', rule.log_prefix, ext, ext2)
+             --lua_util.debugm(rule.name, task, '%s: extension matched in archive: %s', rule.log_prefix, ext)
+             return true
+           elseif match_filter(task, rule, f.name, rule.mime_parts_filter_regex, 'regex') then
+             lua_util.debugm(rule.name, task, '%s: filename regex matched in archive', rule.log_prefix)
+             return true
            end
          end
        end