diff --git a/src/mimeparser.rs b/src/mimeparser.rs index febc20bda..4000b34c4 100644 --- a/src/mimeparser.rs +++ b/src/mimeparser.rs @@ -2,6 +2,7 @@ use std::collections::{HashMap, HashSet}; use std::future::Future; +use std::path::Path; use std::pin::Pin; use std::str; @@ -861,7 +862,7 @@ impl MimeMessage { is_related: bool, ) -> Result { let mut any_part_added = false; - let mimetype = get_mime_type(mail)?.0; + let mimetype = get_mime_type(mail, &get_attachment_filename(context, mail)?)?.0; match (mimetype.type_(), mimetype.subtype().as_str()) { /* Most times, multipart/alternative contains true alternatives as text/plain and text/html. If we find a multipart/mixed @@ -869,9 +870,9 @@ impl MimeMessage { apple mail: "plaintext" as an alternative to "html+PDF attachment") */ (mime::MULTIPART, "alternative") => { for cur_data in &mail.subparts { - if get_mime_type(cur_data)?.0 == "multipart/mixed" - || get_mime_type(cur_data)?.0 == "multipart/related" - { + let mime_type = + get_mime_type(cur_data, &get_attachment_filename(context, cur_data)?)?.0; + if mime_type == "multipart/mixed" || mime_type == "multipart/related" { any_part_added = self .parse_mime_recursive(context, cur_data, is_related) .await?; @@ -881,7 +882,11 @@ impl MimeMessage { if !any_part_added { /* search for text/plain and add this */ for cur_data in &mail.subparts { - if get_mime_type(cur_data)?.0.type_() == mime::TEXT { + if get_mime_type(cur_data, &get_attachment_filename(context, cur_data)?)? + .0 + .type_() + == mime::TEXT + { any_part_added = self .parse_mime_recursive(context, cur_data, is_related) .await?; @@ -1007,10 +1012,9 @@ impl MimeMessage { is_related: bool, ) -> Result { // return true if a part was added - let (mime_type, msg_type) = get_mime_type(mail)?; - let raw_mime = mail.ctype.mimetype.to_lowercase(); - let filename = get_attachment_filename(context, mail)?; + let (mime_type, msg_type) = get_mime_type(mail, &filename)?; + let raw_mime = mail.ctype.mimetype.to_lowercase(); let old_part_count = self.parts.len(); @@ -1865,7 +1869,10 @@ pub struct Part { } /// return mimetype and viewtype for a parsed mail -fn get_mime_type(mail: &mailparse::ParsedMail<'_>) -> Result<(Mime, Viewtype)> { +fn get_mime_type( + mail: &mailparse::ParsedMail<'_>, + filename: &Option, +) -> Result<(Mime, Viewtype)> { let mimetype = mail.ctype.mimetype.parse::()?; let viewtype = match mimetype.type_() { @@ -1901,7 +1908,16 @@ fn get_mime_type(mail: &mailparse::ParsedMail<'_>) -> Result<(Mime, Viewtype)> { Viewtype::Unknown } } - mime::APPLICATION => Viewtype::File, + mime::APPLICATION => match mimetype.subtype() { + mime::OCTET_STREAM => match filename { + Some(filename) => match message::guess_msgtype_from_suffix(Path::new(&filename)) { + Some((viewtype, _)) => viewtype, + None => Viewtype::File, + }, + None => Viewtype::File, + }, + _ => Viewtype::File, + }, _ => Viewtype::Unknown, }; @@ -3756,4 +3772,22 @@ Content-Disposition: reaction\n\ Ok(()) } + + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn test_jpeg_as_application_octet_stream() -> Result<()> { + let context = TestContext::new_alice().await; + let raw = include_bytes!("../test-data/message/jpeg-as-application-octet-stream.eml"); + + let msg = MimeMessage::from_bytes(&context.ctx, &raw[..], None) + .await + .unwrap(); + assert_eq!(msg.parts.len(), 1); + assert_eq!(msg.parts[0].typ, Viewtype::Image); + + receive_imf(&context, &raw[..], false).await?; + let msg = context.get_last_msg().await; + assert_eq!(msg.get_viewtype(), Viewtype::Image); + + Ok(()) + } } diff --git a/test-data/message/jpeg-as-application-octet-stream.eml b/test-data/message/jpeg-as-application-octet-stream.eml new file mode 100644 index 000000000..7596b59c7 --- /dev/null +++ b/test-data/message/jpeg-as-application-octet-stream.eml @@ -0,0 +1,76 @@ +X-Mozilla-Status: 0801 +X-Mozilla-Status2: 10000000 +Content-Type: multipart/mixed; boundary="------------L1v4sF5IlAZ0HirXymXElgpK" +Message-ID: <1e3b3bb0-f34f-71e2-6b86-bce80bef2c6f@example.org> +Date: Thu, 3 Aug 2023 13:31:01 -0300 +MIME-Version: 1.0 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 + Thunderbird/102.13.0 +Content-Language: en-US +To: bob@example.net +From: Alice +X-Identity-Key: id3 +Fcc: imap://alice%40example.org@in.example.org/Sent + +This is a multi-part message in MIME format. +--------------L1v4sF5IlAZ0HirXymXElgpK +Content-Type: text/plain; charset=UTF-8; format=flowed +Content-Transfer-Encoding: 7bit + + +--------------L1v4sF5IlAZ0HirXymXElgpK +Content-Type: application/octet-stream; name="rusty_deltachat_logo.jpeg" +Content-Disposition: attachment; filename="rusty_deltachat_logo.jpeg" +Content-Transfer-Encoding: base64 + +/9j/4AAQSkZJRgABAQIAzADMAAD/2wBDAP////////////////////////////////////// +////////////////////////////////////////////////2wBDAf////////////////// +////////////////////////////////////////////////////////////////////wAAR +CAEAAQADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAA +AgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkK +FhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWG +h4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl +5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREA +AgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYk +NOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOE +hYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk +5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwCSiiigAooooAKKKKACiiigAooprHAzQA6i +mhgfY0McA0AAYGnVX6U/efagA3Hdnt6VL15qvS5OMZ4oAUt82R26f596lByM1BSgkcA0APZ+ +eO3X3qSq9PV8DBoAl6UVCzZ+lPQ8fSgB9FFICD0oAWiiigAooooAKKKKACiiigAooooAKKKK +ACiiigApCcDNLTH6UAKGB9j6UjkYx3qKigAooooAKKKKACiiigAooooAKKKKAClBI6UlFACk +k9akTofrUVKCR0oAnoqEuT7fSnp0P1oAfRRRQAUUUUAFFFFABRRRQAUUUUAFIwyDTd496QuM +cUAMBI6GkJJ60UUAFFFFABRSqMmpgAOlAEYQnrxTtg96fSEgdTQAmxfT+dLtX0FJvX1o3r6/ +zoAXavoKTYvp/OlBB6GloAZsHvTSh7HNS0UAQEEdRSVYqNk7j8qAI6KKKACnq2ODTKKAJS47 +CnDkA1AOtWKACiiigAooooAKKKKACimscDOM03zPb9f/AK1ADXGD9eabSk5OTSUAFFFFABRR +RQBMowB7806kXoPpQeh+hoAjZ+w/OmUUUAFFFFABTw/r+dMooAsdaKhDEfT0qUEHkUALRRRQ +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 +jzmpNoxjFLRQAgGOlLRRQB//2Q== + +--------------L1v4sF5IlAZ0HirXymXElgpK--