From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 15 Dec 2021 15:20:19 +0000 (+0000)
Subject: [Minor] Antivirus: Improve parts selection
X-Git-Tag: 3.2~157
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c20ae890aa62c5323c7dad718ef356e09b00e2a5;p=rspamd.git

[Minor] Antivirus: Improve parts selection
---

diff --git a/lualib/lua_scanners/common.lua b/lualib/lua_scanners/common.lua
index a92d923d0..d052f4552 100644
--- a/lualib/lua_scanners/common.lua
+++ b/lualib/lua_scanners/common.lua
@@ -459,14 +459,15 @@ local function check_parts_match(task, rule)
     end
 
     if rule.scan_all_mime_parts ~= false then
+      local is_part_checkable = (p:is_attachment() and (not p:is_image() or rule.scan_image_mime))
       if detected_ext then
         -- We know what to scan!
         local magic = lua_magic_types[detected_ext] or {}
 
-        if p:is_attachment() or magic.av_check ~= false then
+        if magic.av_check ~= false or is_part_checkable then
           return true
         end
-      elseif p:is_attachment() then
+      elseif is_part_checkable then
         -- Just rely on attachment property
         return true
       end