alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

message: improve attachment,encrypted part detection

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2022-04-10 13:18:03 +03:00
parent 478ef67fc6
commit 72c0f82b41
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/message/mu-message.cc
View File

@ -250,7 +250,8 @@ get_mailing_list(const MimeMessage& mime_msg)
} }
static bool /* heuristic */ static bool /* heuristic */
looks_like_attachment(const MimePart& part, const Option<MimeContentType>& ctype) looks_like_attachment(const MimeObject& parent,
const MimePart& part, const MimeContentType& ctype)
{ {
constexpr std::array<std::pair<const char*, const char*>, 4> att_types = {{ constexpr std::array<std::pair<const char*, const char*>, 4> att_types = {{
{"image", "*"}, {"image", "*"},
@ -259,22 +260,30 @@ looks_like_attachment(const MimePart& part, const Option<MimeContentType>& ctype
{"application", "x-patch"} {"application", "x-patch"}
}}; }};
if (part.is_attachment()) /* explicity set as attachment */ if (parent) { /* crypto multipart children are not considered attachments */
return true; if (const auto parent_ctype{parent.content_type()}; parent_ctype) {
else if (!ctype) if (parent_ctype->is_type("multipart", "signed") ||
return false; parent_ctype->is_type("multipart", "encrypted"))
return false;
}
}
/* we also consider patches, images, audio, and non-pgp-signature /* we also consider patches, images, audio, and non-pgp-signature
* application attachments to be attachments... */ * application attachments to be attachments... */
if (ctype->is_type("*", "pgp-signature")) if (ctype.is_type("*", "pgp-signature"))
return false; /* don't consider as a signature */ return false; /* don't consider as a signature */
if (ctype->is_type("text", "*") && if (ctype.is_type("text", "*") &&
(ctype->is_type("*", "plain") || ctype->is_type("*", "html"))) (ctype.is_type("*", "plain") || ctype.is_type("*", "html")))
return false; /* not a signature */ return false; /* not a signature */
/* if not one of those special types, consider it any attachment
* if it says so */
if (part.is_attachment())
return true;
const auto it = seq_find_if(att_types, [&](auto&& item){ const auto it = seq_find_if(att_types, [&](auto&& item){
return ctype->is_type(item.first, item.second); return ctype.is_type(item.first, item.second);
}); });
return it != att_types.cend(); /* if found, it's an attachment */ return it != att_types.cend(); /* if found, it's an attachment */
} }
@ -302,13 +311,14 @@ accumulate_text(const MimePart& part, Message::Private& info,
} }
static void static void
process_part(const MimePart& part, Message::Private& info) process_part(const MimeObject& parent, const MimePart& part,
Message::Private& info)
{ {
const auto ctype{part.content_type()}; const auto ctype{part.content_type()};
if (!ctype) if (!ctype)
return; return;
if (looks_like_attachment(part, ctype)) if (looks_like_attachment(parent, part, *ctype))
info.flags |= Flags::HasAttachment; info.flags |= Flags::HasAttachment;
// if there are text parts, gather. // if there are text parts, gather.
@ -341,11 +351,12 @@ process_message(const MimeMessage& mime_msg, const std::string& path,
if (part.is_part() || if (part.is_part() ||
part.is_message_part() || part.is_message_part() ||
part.is_multipart_signed()) part.is_multipart_signed() ||
part.is_multipart_encrypted())
info.parts.emplace_back(part); info.parts.emplace_back(part);
if (part.is_part()) if (part.is_part())
process_part(part, info); process_part(parent, part, info);
if (part.is_multipart_signed()) if (part.is_multipart_signed())
info.flags |= Flags::Signed; info.flags |= Flags::Signed;