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

fix: apply Autocrypt headers if timestamp is unchanged

Browse Source 
If two messages arrive with the same timestamp,
the one that arrived later should be preferred.
This commit is contained in:
link2xt
2024-02-20 11:55:52 +00:00
parent 06e79e8926
commit b4e9a9764f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/peerstate.rs
View File

@@ -337,7 +337,7 @@ impl Peerstate {
return; return;
} }
if message_time > self.last_seen { if message_time >= self.last_seen {
self.last_seen = message_time; self.last_seen = message_time;
self.last_seen_autocrypt = message_time; self.last_seen_autocrypt = message_time;
if (header.prefer_encrypt == EncryptPreference::Mutual if (header.prefer_encrypt == EncryptPreference::Mutual
@@ -360,7 +360,7 @@ impl Peerstate {
return; return;
} }
if message_time > self.gossip_timestamp { if message_time >= self.gossip_timestamp {
self.gossip_timestamp = message_time; self.gossip_timestamp = message_time;
if self.gossip_key.as_ref() != Some(&gossip_header.public_key) { if self.gossip_key.as_ref() != Some(&gossip_header.public_key) {
self.gossip_key = Some(gossip_header.public_key.clone()); self.gossip_key = Some(gossip_header.public_key.clone());
@@ -995,7 +995,7 @@ mod tests {
assert_eq!(peerstate.prefer_encrypt, EncryptPreference::Reset); assert_eq!(peerstate.prefer_encrypt, EncryptPreference::Reset);
// Same header will be applied in the future. // Same header will be applied in the future.
peerstate.apply_header(&header, 400); peerstate.apply_header(&header, 300);
assert_eq!(peerstate.prefer_encrypt, EncryptPreference::Mutual); assert_eq!(peerstate.prefer_encrypt, EncryptPreference::Mutual);
} }
} }