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

fix: don't leak Group-ID in Message-ID

Browse Source 
Chat assignment based on In-Reply-To and References works good enough
even if the message cannot be decrypted.
This commit is contained in:
link2xt
2024-02-17 15:50:29 +00:00
parent 1a1467f7cf
commit 78d01933ad
4 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/tools.rs
View File

@@ -281,15 +281,12 @@ pub(crate) fn create_id() -> String {
/// - this function is called for all outgoing messages.
/// - the message ID should be globally unique
/// - do not add a counter or any private data as this leaks information unnecessarily
pub(crate) fn create_outgoing_rfc724_mid(grpid: Option<&str>, from_addr: &str) -> String {
pub(crate) fn create_outgoing_rfc724_mid(from_addr: &str) -> String {
let hostname = from_addr
.find('@')
.and_then(|k| from_addr.get(k..))
.unwrap_or("@nohost");
match grpid {
Some(grpid) => format!("Gr.{}.{}{}", grpid, create_id(), hostname),
None => format!("Mr.{}.{}{}", create_id(), create_id(), hostname),
}
format!("Mr.{}.{}{}", create_id(), create_id(), hostname)
}
/// Extract the group id (grpid) from a message id (mid)
@@ -1013,21 +1010,10 @@ DKIM Results: Passed=true, Works=true, Allow_Keychange=true";
#[test]
fn test_create_outgoing_rfc724_mid() {
// create a normal message-id
let mid = create_outgoing_rfc724_mid(None, "foo@bar.de");
let mid = create_outgoing_rfc724_mid("foo@bar.de");
assert!(mid.starts_with("Mr."));
assert!(mid.ends_with("bar.de"));
assert!(extract_grpid_from_rfc724_mid(mid.as_str()).is_none());
// create a message-id containing a group-id
let grpid = create_id();
let mid = create_outgoing_rfc724_mid(Some(&grpid), "foo@bar.de");
assert!(mid.starts_with("Gr."));
assert!(mid.ends_with("bar.de"));
assert_eq!(
extract_grpid_from_rfc724_mid(mid.as_str()),
Some(grpid.as_str())
);
}
#[test]