From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sun, 11 Apr 2021 20:13:42 +0000 (+0100)
Subject: [Rules] Fix FPs for CTYPE_MIXED_BOGUS
X-Git-Tag: 3.0~508
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01c729e15e01db5a5353f783325c520ac069a532;p=thirdparty%2Frspamd.git

[Rules] Fix FPs for CTYPE_MIXED_BOGUS
---

diff --git a/rules/headers_checks.lua b/rules/headers_checks.lua
index c4e4a4a678..79b8e5c2f3 100644
--- a/rules/headers_checks.lua
+++ b/rules/headers_checks.lua
@@ -1004,14 +1004,19 @@ rspamd_config.CTYPE_MIXED_BOGUS = {
     if (not ct:lower():match('^multipart/mixed')) then return false end
     local found = false
     -- Check each part and look for a part that isn't multipart/* or text/plain or text/html
+    local ntext_parts = 0
     for _,p in ipairs(parts) do
-      local pct = p:get_header('Content-Type')
-      if (pct) then
-        pct = pct:lower()
-        if not ((pct:match('^multipart/') or
-            pct:match('^text/plain') or
-            pct:match('^text/html'))) then
+      local mtype,_ = p:get_type()
+      if mtype then
+        if mtype == 'text' then
+          ntext_parts = ntext_parts + 1
+          if ntext_parts > 2 then
+            found = true
+            break
+          end
+        elseif mtype ~= 'multipart' then
           found = true
+          break
         end
       end
     end