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

fix #786 by always succeeding to create a canonical deterministic message-id -- thanks @csb0730 for the analysis of the issue

Browse Source
This commit is contained in:
holger krekel
2019-11-03 01:12:59 +01:00
parent e1df41c209
commit cb00f5da79
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dc_tools.rs
View File

@@ -249,12 +249,10 @@ pub(crate) fn dc_create_incoming_rfc724_mid(
contact_id_from: u32, contact_id_from: u32,
contact_ids_to: &[u32], contact_ids_to: &[u32],
) -> Option<String> { ) -> Option<String> {
if contact_ids_to.is_empty() { /* create a deterministic rfc724_mid from input such that
return None; repeatedly calling it with the same input results in the same Message-id */
}
/* find out the largest receiver ID (we could also take the smallest, but it should be unique) */
let largest_id_to = contact_ids_to.iter().max().copied().unwrap_or_default();
let largest_id_to = contact_ids_to.iter().max().copied().unwrap_or_default();
let result = format!( let result = format!(
"{}-{}-{}@stub", "{}-{}-{}@stub",
message_timestamp, contact_id_from, largest_id_to message_timestamp, contact_id_from, largest_id_to
@@ -1232,6 +1230,8 @@ mod tests {
fn test_dc_create_incoming_rfc724_mid() { fn test_dc_create_incoming_rfc724_mid() {
let res = dc_create_incoming_rfc724_mid(123, 45, &vec![6, 7]); let res = dc_create_incoming_rfc724_mid(123, 45, &vec![6, 7]);
assert_eq!(res, Some("123-45-7@stub".into())); assert_eq!(res, Some("123-45-7@stub".into()));
let res = dc_create_incoming_rfc724_mid(123, 45, &vec![]);
assert_eq!(res, Some("123-45-0@stub".into()));
} }
#[test] #[test]