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

feat: log when late Autocrypt header is ignored

Browse Source
This commit is contained in:
link2xt
2024-10-18 02:45:01 +00:00
parent 864833d232
commit 5e13b4c736
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/decrypt.rs
View File

@@ -313,7 +313,7 @@ pub(crate) async fn get_autocrypt_peerstate(
if let Some(ref mut peerstate) = peerstate { if let Some(ref mut peerstate) = peerstate {
if addr_cmp(&peerstate.addr, from) { if addr_cmp(&peerstate.addr, from) {
if allow_change { if allow_change {
peerstate.apply_header(header, message_time); peerstate.apply_header(context, header, message_time);
peerstate.save_to_db(&context.sql).await?; peerstate.save_to_db(&context.sql).await?;
} else { } else {
info!( info!(

19
src/peerstate.rs
View File

@@ -343,7 +343,7 @@ impl Peerstate {
} }
/// Updates peerstate according to the given `Autocrypt` header. /// Updates peerstate according to the given `Autocrypt` header.
pub fn apply_header(&mut self, header: &Aheader, message_time: i64) { pub fn apply_header(&mut self, context: &Context, header: &Aheader, message_time: i64) {
if !addr_cmp(&self.addr, &header.addr) { if !addr_cmp(&self.addr, &header.addr) {
return; return;
} }
@@ -362,6 +362,13 @@ impl Peerstate {
self.public_key = Some(header.public_key.clone()); self.public_key = Some(header.public_key.clone());
self.recalc_fingerprint(); self.recalc_fingerprint();
} }
} else {
warn!(
context,
"Ignoring outdated Autocrypt header because message_time={} < last_seen={}.",
message_time,
self.last_seen
);
} }
} }
@@ -842,7 +849,7 @@ pub(crate) async fn maybe_do_aeap_transition(
let header = info.autocrypt_header.as_ref().context( let header = info.autocrypt_header.as_ref().context(
"Internal error: Tried to do an AEAP transition without an autocrypt header??", "Internal error: Tried to do an AEAP transition without an autocrypt header??",
)?; )?;
peerstate.apply_header(header, info.message_time); peerstate.apply_header(context, header, info.message_time);
peerstate peerstate
.save_to_db_ex(&context.sql, Some(&old_addr)) .save_to_db_ex(&context.sql, Some(&old_addr))
@@ -1021,6 +1028,8 @@ mod tests {
#[tokio::test(flavor = "multi_thread", worker_threads = 2)] #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_peerstate_degrade_reordering() { async fn test_peerstate_degrade_reordering() {
let ctx = crate::test_utils::TestContext::new().await;
let addr = "example@example.org"; let addr = "example@example.org";
let pub_key = alice_keypair().public; let pub_key = alice_keypair().public;
let header = Aheader::new(addr.to_string(), pub_key, EncryptPreference::Mutual); let header = Aheader::new(addr.to_string(), pub_key, EncryptPreference::Mutual);
@@ -1045,7 +1054,7 @@ mod tests {
fingerprint_changed: false, fingerprint_changed: false,
}; };
peerstate.apply_header(&header, 100); peerstate.apply_header(&ctx, &header, 100);
assert_eq!(peerstate.prefer_encrypt, EncryptPreference::Mutual); assert_eq!(peerstate.prefer_encrypt, EncryptPreference::Mutual);
peerstate.degrade_encryption(300); peerstate.degrade_encryption(300);
@@ -1053,11 +1062,11 @@ mod tests {
// This has message time 200, while encryption was degraded at timestamp 300. // This has message time 200, while encryption was degraded at timestamp 300.
// Because of reordering, header should not be applied. // Because of reordering, header should not be applied.
peerstate.apply_header(&header, 200); peerstate.apply_header(&ctx, &header, 200);
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, 300); peerstate.apply_header(&ctx, &header, 300);
assert_eq!(peerstate.prefer_encrypt, EncryptPreference::Mutual); assert_eq!(peerstate.prefer_encrypt, EncryptPreference::Mutual);
} }
} }