Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-03 13:26:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

decode filenames as CHARSET'LANG'test%2E%70%64%66

Browse Source
This commit is contained in:
B. Petersen
2020-11-15 17:41:29 +01:00
parent 07109e9b17
commit a29dc514d3
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mimeparser.rs
View File

@@ -26,6 +26,7 @@ use crate::param::*;
use crate::peerstate::Peerstate; use crate::peerstate::Peerstate;
use crate::simplify::*; use crate::simplify::*;
use crate::stock::StockMessage; use crate::stock::StockMessage;
use percent_encoding::percent_decode_str;
/// A parsed MIME message. /// A parsed MIME message.
/// ///
@@ -1302,6 +1303,18 @@ fn get_attachment_filename(mail: &mailparse::ParsedMail) -> Result<Option<String
let desired_filename = let desired_filename =
desired_filename.or_else(|| mail.ctype.params.get("name").map(|s| s.to_string())); desired_filename.or_else(|| mail.ctype.params.get("name").map(|s| s.to_string()));
// decode filename as CHARSET'LANG'test%2E%70%64%66.
// we're always assuming utf-8,
// however, due to lossy decoding, the extension is preserved
// and things should not be totally bad for other encodings.
// we can tweak that when we see sth. else really used in the wild nowadays.
let desired_filename = if let Some(name) = desired_filename {
let name = name.splitn(3, '\'').last().unwrap().to_string();
Some(percent_decode_str(&name).decode_utf8_lossy().to_string())
} else {
None
};
// If there is no filename, but part is an attachment, guess filename // If there is no filename, but part is an attachment, guess filename
if ct.disposition == DispositionType::Attachment && desired_filename.is_none() { if ct.disposition == DispositionType::Attachment && desired_filename.is_none() {
if let Some(subtype) = mail.ctype.mimetype.split('/').nth(1) { if let Some(subtype) = mail.ctype.mimetype.split('/').nth(1) {