aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2019-10-14 14:55:36 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2019-10-14 14:55:36 +0100
commit13a09de8ed30edd27b3bd8422e75ebd695251f81 (patch)
tree7b591de5e0bcd90b963e14b3a4c120d077376df5 /src
parentb711239c11939e529bdf3f292754e709522680ed (diff)
downloadrspamd-13a09de8ed30edd27b3bd8422e75ebd695251f81.tar.gz
rspamd-13a09de8ed30edd27b3bd8422e75ebd695251f81.zip
[Feature] Multimap: Do not check files in office archives
Diffstat (limited to 'src')
-rw-r--r--src/plugins/lua/multimap.lua18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua
index 50733d92d..13316583c 100644
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@ -868,8 +868,24 @@ local function multimap_callback(task, rule)
return p:is_attachment() or (not p:is_text()) and (not p:is_multipart())
end
+ local function filter_archive(p)
+ local ext = p:get_detected_ext()
+ local det_type = 'unknown'
+
+ if ext then
+ local lua_magic_types = require "lua_magic/types"
+ local det_t = lua_magic_types[ext]
+
+ if det_t then
+ det_type = det_t.type
+ end
+ end
+
+ return p:is_archive() and det_type == 'archive' and not rule.skip_archives
+ end
+
for _,p in fun.iter(fun.filter(filter_parts, parts)) do
- if p:is_archive() and not rule['skip_archives'] then
+ if filter_archive(p) then
local fnames = p:get_archive():get_files()
for _,fn in ipairs(fnames) do