From 1031915b753cfaa6b054ff3d932fa62910eeb70c Mon Sep 17 00:00:00 2001
From: ValdikSS <iam@valdikss.org.ru>
Date: Sat, 24 Oct 2020 16:48:16 +0300
Subject: [PATCH] FIX: ignore PGP data in emails by MIME type

New version of Thunderbird email client reimplemented PGP support. Now the following attachments are added by default, if email signatures are enabled:

* OpenPGP_0x(pgp key id).asc
* OpenPGP_signature(.asc)

The last one has `name="OpenPGP_signature.asc"` in `Content-Type` but `filename="OpenPGP_signature"` (without extension) in `Content-Disposition: attachment`.

Since both the key and the signature have proper MIME types, filter them by default.
---
 config/site_settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index f3cabc72506..67f1b42340b 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1149,7 +1149,7 @@ email:
     max: 36500
   blocked_attachment_content_types:
     type: list
-    default: "pkcs7|x-vcard"
+    default: "pkcs7|x-vcard|pgp-keys|pgp-signature"
     list_type: compact
   blocked_attachment_filenames:
     type: list