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

fix: Never send empty To: header (#6663)

Browse Source 
fix #6662 by adding "hidden-recipients:" if To: header would be empty
This commit is contained in:
Hocuri
2025-03-16 10:47:57 +01:00
committed by GitHub
parent 65ea456bd8
commit 0931d9326e
2 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/mimefactory.rs
View File

@@ -607,10 +607,7 @@ impl MimeFactory {
|| to.len() + past_members.len() == self.member_timestamps.len()
);
if to.is_empty() {
to.push(Address::new_group(
Some("hidden-recipients".to_string()),
Vec::new(),
));
to.push(hidden_recipients());
}
// Start with Internet Message Format headers in the order of the standard example
@@ -888,21 +885,23 @@ impl MimeFactory {
} else if header_name == "to" {
protected_headers.push(header.clone());
if is_encrypted {
let mut to_without_names = to
.clone()
.into_iter()
.filter_map(|header| match header {
Address::Address(mb) => Some(Address::Address(EmailAddress {
name: None,
email: mb.email,
})),
_ => None,
})
.collect::<Vec<_>>();
if to_without_names.is_empty() {
to_without_names.push(hidden_recipients());
}
unprotected_headers.push((
original_header_name,
Address::new_list(
to.clone()
.into_iter()
.filter_map(|header| match header {
Address::Address(mb) => Some(Address::Address(EmailAddress {
name: None,
email: mb.email,
})),
_ => None,
})
.collect::<Vec<_>>(),
)
.into(),
Address::new_list(to_without_names).into(),
));
} else {
unprotected_headers.push(header.clone());
@@ -1633,6 +1632,10 @@ impl MimeFactory {
}
}
fn hidden_recipients() -> Address<'static> {
Address::new_group(Some("hidden-recipients".to_string()), Vec::new())
}
async fn build_body_file(context: &Context, msg: &Message) -> Result<MimePart<'static>> {
let file_name = msg.get_filename().context("msg has no file")?;
let suffix = Path::new(&file_name)