From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 9 Jan 2019 18:29:40 +0000 (+0000)
Subject: [Minor] Relax CTYPE_MISSING_DISPOSITION rule for pgp encryption
X-Git-Tag: 1.9.0~344
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da7b65e4b52f1abe485bfcf1abe7f36c836c4186;p=thirdparty%2Frspamd.git

[Minor] Relax CTYPE_MISSING_DISPOSITION rule for pgp encryption

Issue: #2706
Closes: #2706
---

diff --git a/rules/headers_checks.lua b/rules/headers_checks.lua
index 353690b56a..359975dc13 100644
--- a/rules/headers_checks.lua
+++ b/rules/headers_checks.lua
@@ -958,6 +958,7 @@ rspamd_config:register_symbol{
   description = 'Some of the recipients match the envelope',
 }
 
+-- TODO: rewrite this rule, it should not touch headers directly
 rspamd_config.CTYPE_MISSING_DISPOSITION = {
   callback = function(task)
     local parts = task:get_parts()
@@ -972,6 +973,18 @@ rspamd_config.CTYPE_MISSING_DISPOSITION = {
           then
             return false
           end
+
+          local parent = p:get_parent()
+
+          if parent then
+            local t,st = parent:get_type()
+
+            if t == 'multipart' and st == 'encrypted' then
+              -- Special case
+              return false
+            end
+          end
+
           return true
         end
       end