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

refactor: receive_imf: Don't abort processing message on non-critical errors

Browse Source 
Follow-up to f27d54f. Non-critical errors shouldn't lead to missing messages. But in debug builds,
panic on such errors, otherwise we won't catch them w/o special tests.
This commit is contained in:
iequidoo
2025-07-24 05:54:42 -03:00
committed by link2xt
parent 268a5cf70b
commit 9b860de3d5
2 changed files with 83 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
src/receive_imf.rs
View File

@@ -29,7 +29,6 @@ use crate::key::self_fingerprint_opt;
use crate::key::{DcKey, Fingerprint}; use crate::key::{DcKey, Fingerprint};
use crate::log::LogExt; use crate::log::LogExt;
use crate::log::{info, warn}; use crate::log::{info, warn};
use crate::logged_debug_assert;
use crate::message::{ use crate::message::{
self, Message, MessageState, MessengerMessage, MsgId, Viewtype, rfc724_mid_exists, self, Message, MessageState, MessengerMessage, MsgId, Viewtype, rfc724_mid_exists,
}; };
@@ -45,6 +44,7 @@ use crate::sync::Sync::*;
use crate::tools::{self, buf_compress, remove_subject_prefix}; use crate::tools::{self, buf_compress, remove_subject_prefix};
use crate::{chatlist_events, ensure_and_debug_assert, ensure_and_debug_assert_eq, location}; use crate::{chatlist_events, ensure_and_debug_assert, ensure_and_debug_assert_eq, location};
use crate::{contact, imap}; use crate::{contact, imap};
use crate::{logged_debug_assert, logged_debug_assert_ok};
/// This is the struct that is returned after receiving one email (aka MIME message). /// This is the struct that is returned after receiving one email (aka MIME message).
/// ///
@@ -1165,10 +1165,8 @@ async fn decide_chat_assignment(
let now = tools::time(); let now = tools::time();
let update_config = if last_time.saturating_add(24 * 60 * 60) <= now { let update_config = if last_time.saturating_add(24 * 60 * 60) <= now {
let mut msg = Message::new_text(stock_str::cant_decrypt_outgoing_msgs(context).await); let mut msg = Message::new_text(stock_str::cant_decrypt_outgoing_msgs(context).await);
chat::add_device_msg(context, None, Some(&mut msg)) let res = chat::add_device_msg(context, None, Some(&mut msg)).await;
.await logged_debug_assert_ok!(context, res).ok();
.log_err(context)
.ok();
true true
} else { } else {
last_time > now last_time > now
@@ -1883,7 +1881,7 @@ async fn add_parts(
}; };
for (group_changes_msg, cmd, added_removed_id) in group_changes.extra_msgs { for (group_changes_msg, cmd, added_removed_id) in group_changes.extra_msgs {
chat::add_info_msg_with_cmd( let res = chat::add_info_msg_with_cmd(
context, context,
chat_id, chat_id,
&group_changes_msg, &group_changes_msg,
@@ -1894,7 +1892,8 @@ async fn add_parts(
None, None,
added_removed_id, added_removed_id,
) )
.await?; .await;
logged_debug_assert_ok!(context, res).ok();
} }
if let Some(node_addr) = mime_parser.get_header(HeaderDef::IrohNodeAddr) { if let Some(node_addr) = mime_parser.get_header(HeaderDef::IrohNodeAddr) {
@@ -1951,7 +1950,7 @@ async fn add_parts(
if part.is_reaction { if part.is_reaction {
let reaction_str = simplify::remove_footers(part.msg.as_str()); let reaction_str = simplify::remove_footers(part.msg.as_str());
let is_incoming_fresh = mime_parser.incoming && !seen; let is_incoming_fresh = mime_parser.incoming && !seen;
set_msg_reaction( let res = set_msg_reaction(
context, context,
mime_in_reply_to, mime_in_reply_to,
chat_id, chat_id,
@@ -1960,7 +1959,10 @@ async fn add_parts(
Reaction::from(reaction_str.as_str()), Reaction::from(reaction_str.as_str()),
is_incoming_fresh, is_incoming_fresh,
) )
.await?; .await;
if logged_debug_assert_ok!(context, res).is_err() {
continue;
}
} }
let mut param = part.param.clone(); let mut param = part.param.clone();
@@ -1968,8 +1970,10 @@ async fn add_parts(
param.set_int(Param::Cmd, is_system_message as i32); param.set_int(Param::Cmd, is_system_message as i32);
} }
if let Some(replace_msg_id) = replace_msg_id { if let Some(placeholder) = match replace_msg_id {
let placeholder = Message::load_from_db(context, replace_msg_id).await?; None => None,
Some(replace_msg_id) => Message::load_from_db_optional(context, replace_msg_id).await?,
} {
for key in [ for key in [
Param::WebxdcSummary, Param::WebxdcSummary,
Param::WebxdcSummaryTimestamp, Param::WebxdcSummaryTimestamp,
@@ -1980,6 +1984,8 @@ async fn add_parts(
param.set(key, value); param.set(key, value);
} }
} }
} else {
replace_msg_id = None;
} }
let (msg, typ): (&str, Viewtype) = if let Some(better_msg) = &better_msg { let (msg, typ): (&str, Viewtype) = if let Some(better_msg) = &better_msg {
@@ -2117,26 +2123,29 @@ RETURNING id
if let Some(topic) = mime_parser.get_header(HeaderDef::IrohGossipTopic) { if let Some(topic) = mime_parser.get_header(HeaderDef::IrohGossipTopic) {
// default encoding of topic ids is `hex`. // default encoding of topic ids is `hex`.
let mut topic_raw = [0u8; 32]; let mut topic_raw = [0u8; 32];
BASE32_NOPAD let res = BASE32_NOPAD
.decode_mut(topic.to_ascii_uppercase().as_bytes(), &mut topic_raw) .decode_mut(topic.to_ascii_uppercase().as_bytes(), &mut topic_raw)
.map_err(|e| e.error) .map_err(|e| e.error)
.context("Wrong gossip topic header")?; .context("Wrong gossip topic header");
if logged_debug_assert_ok!(context, res).is_ok() {
let topic = TopicId::from_bytes(topic_raw); let topic = TopicId::from_bytes(topic_raw);
insert_topic_stub(context, *msg_id, topic).await?; let res = insert_topic_stub(context, *msg_id, topic).await;
logged_debug_assert_ok!(context, res).ok();
}
} else { } else {
warn!(context, "webxdc doesn't have a gossip topic") warn!(context, "webxdc doesn't have a gossip topic")
} }
} }
maybe_set_logging_xdc_inner( let res = maybe_set_logging_xdc_inner(
context, context,
part.typ, part.typ,
chat_id, chat_id,
part.param.get(Param::Filename), part.param.get(Param::Filename),
*msg_id, *msg_id,
) )
.await?; .await;
logged_debug_assert_ok!(context, res).ok();
} }
if let Some(replace_msg_id) = replace_msg_id { if let Some(replace_msg_id) = replace_msg_id {
@@ -3658,21 +3667,21 @@ async fn add_or_lookup_contacts_by_address_list(
) -> Result<Vec<Option<ContactId>>> { ) -> Result<Vec<Option<ContactId>>> {
let mut contact_ids = Vec::new(); let mut contact_ids = Vec::new();
for info in address_list { for info in address_list {
contact_ids.push(None);
let addr = &info.addr; let addr = &info.addr;
if !may_be_valid_addr(addr) { if !may_be_valid_addr(addr) {
contact_ids.push(None);
continue; continue;
} }
let display_name = info.display_name.as_deref(); let display_name = info.display_name.as_deref();
if let Ok(addr) = ContactAddress::new(addr) { let Ok(addr) = ContactAddress::new(addr) else {
let (contact_id, _) =
Contact::add_or_lookup(context, display_name.unwrap_or_default(), &addr, origin)
.await?;
contact_ids.push(Some(contact_id));
} else {
warn!(context, "Contact with address {:?} cannot exist.", addr); warn!(context, "Contact with address {:?} cannot exist.", addr);
contact_ids.push(None); continue;
} };
let res =
Contact::add_or_lookup(context, display_name.unwrap_or_default(), &addr, origin).await;
let contact_id = logged_debug_assert_ok!(context, res).ok().map(|(id, _)| id);
contact_ids.pop();
contact_ids.push(contact_id);
} }
Ok(contact_ids) Ok(contact_ids)
@@ -3689,9 +3698,9 @@ async fn add_or_lookup_key_contacts(
let mut contact_ids = Vec::new(); let mut contact_ids = Vec::new();
let mut fingerprint_iter = fingerprints.iter(); let mut fingerprint_iter = fingerprints.iter();
for info in address_list { for info in address_list {
contact_ids.push(None);
let addr = &info.addr; let addr = &info.addr;
if !may_be_valid_addr(addr) { if !may_be_valid_addr(addr) {
contact_ids.push(None);
continue; continue;
} }
let fingerprint: String = if let Some(fp) = fingerprint_iter.next() { let fingerprint: String = if let Some(fp) = fingerprint_iter.next() {
@@ -3700,27 +3709,28 @@ async fn add_or_lookup_key_contacts(
} else if let Some(key) = gossiped_keys.get(addr) { } else if let Some(key) = gossiped_keys.get(addr) {
key.public_key.dc_fingerprint().hex() key.public_key.dc_fingerprint().hex()
} else if context.is_self_addr(addr).await? { } else if context.is_self_addr(addr).await? {
contact_ids.pop();
contact_ids.push(Some(ContactId::SELF)); contact_ids.push(Some(ContactId::SELF));
continue; continue;
} else { } else {
contact_ids.push(None);
continue; continue;
}; };
let display_name = info.display_name.as_deref(); let display_name = info.display_name.as_deref();
if let Ok(addr) = ContactAddress::new(addr) { let Ok(addr) = ContactAddress::new(addr) else {
let (contact_id, _) = Contact::add_or_lookup_ex( warn!(context, "Contact with address {:?} cannot exist.", addr);
continue;
};
let res = Contact::add_or_lookup_ex(
context, context,
display_name.unwrap_or_default(), display_name.unwrap_or_default(),
&addr, &addr,
&fingerprint, &fingerprint,
origin, origin,
) )
.await?; .await;
contact_ids.push(Some(contact_id)); let contact_id = logged_debug_assert_ok!(context, res).ok().map(|(id, _)| id);
} else { contact_ids.pop();
warn!(context, "Contact with address {:?} cannot exist.", addr); contact_ids.push(contact_id);
contact_ids.push(None);
}
} }
ensure_and_debug_assert_eq!(contact_ids.len(), address_list.len(),); ensure_and_debug_assert_eq!(contact_ids.len(), address_list.len(),);
@@ -3869,36 +3879,37 @@ async fn lookup_key_contacts_by_address_list(
let mut contact_ids = Vec::new(); let mut contact_ids = Vec::new();
let mut fingerprint_iter = fingerprints.iter(); let mut fingerprint_iter = fingerprints.iter();
for info in address_list { for info in address_list {
contact_ids.push(None);
let addr = &info.addr; let addr = &info.addr;
if !may_be_valid_addr(addr) { if !may_be_valid_addr(addr) {
contact_ids.push(None);
continue; continue;
} }
if let Some(fp) = fingerprint_iter.next() { let contact_id = if let Some(fp) = fingerprint_iter.next() {
// Iterator has not ran out of fingerprints yet. // Iterator has not ran out of fingerprints yet.
let display_name = info.display_name.as_deref(); let display_name = info.display_name.as_deref();
let fingerprint: String = fp.hex(); let fingerprint: String = fp.hex();
if let Ok(addr) = ContactAddress::new(addr) { let Ok(addr) = ContactAddress::new(addr) else {
let (contact_id, _) = Contact::add_or_lookup_ex( warn!(context, "Contact with address {:?} cannot exist.", addr);
continue;
};
let res = Contact::add_or_lookup_ex(
context, context,
display_name.unwrap_or_default(), display_name.unwrap_or_default(),
&addr, &addr,
&fingerprint, &fingerprint,
Origin::Hidden, Origin::Hidden,
) )
.await?; .await;
contact_ids.push(Some(contact_id)); logged_debug_assert_ok!(context, res).ok().map(|(id, _)| id)
} else { } else {
warn!(context, "Contact with address {:?} cannot exist.", addr); let res = lookup_key_contact_by_address(context, addr, chat_id).await;
contact_ids.push(None); logged_debug_assert_ok!(context, res).ok().flatten()
} };
} else { contact_ids.pop();
let contact_id = lookup_key_contact_by_address(context, addr, chat_id).await?;
contact_ids.push(contact_id); contact_ids.push(contact_id);
} }
}
ensure_and_debug_assert_eq!(address_list.len(), contact_ids.len(),); ensure_and_debug_assert_eq!(address_list.len(), contact_ids.len(),);
Ok(contact_ids) Ok(contact_ids)
} }

12
src/tools.rs
View File

@@ -823,5 +823,17 @@ macro_rules! logged_debug_assert {
}; };
} }
/// Logs a warning if the second arg is an error. Evaluates to the second arg value.
/// In non-optimized builds, panics also on error.
#[macro_export]
macro_rules! logged_debug_assert_ok {
($ctx:expr, $res:expr) => {{
let res_val = $res;
let res_val = res_val.log_err($ctx);
debug_assert!(res_val.is_ok());
res_val
}};
}
#[cfg(test)] #[cfg(test)]
mod tools_tests; mod tools_tests;