mirrors/mail-server
1
0
Fork 0
mirror of https://github.com/stalwartlabs/mail-server.git synced 2024-11-28 00:56:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Log messageId on ingestion
Some checks failed
trivy / Check (push) Has been cancelled
Details

Browse source
This commit is contained in:
mdecimus 2024-08-22 14:29:11 +02:00
parent fe0ccb11bd
commit 0aaf493f94
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/jmap/src/email/ingest.rs
View file

@ -112,16 +112,16 @@ impl JMAP {
} }
// Obtain message references and thread name // Obtain message references and thread name
let mut message_id = String::new();
let thread_id = { let thread_id = {
let mut references = Vec::with_capacity(5); let mut references = Vec::with_capacity(5);
let mut subject = ""; let mut subject = "";
let mut message_id = "";
for header in message.root_part().headers().iter().rev() { for header in message.root_part().headers().iter().rev() {
match &header.name { match &header.name {
HeaderName::MessageId => header.value.visit_text(|id| { HeaderName::MessageId => header.value.visit_text(|id| {
if !id.is_empty() && id.len() < MAX_ID_LENGTH { if !id.is_empty() && id.len() < MAX_ID_LENGTH {
if message_id.is_empty() { if message_id.is_empty() {
message_id = id; message_id = id.to_string();
} }
references.push(id); references.push(id);
} }
@ -160,7 +160,7 @@ impl JMAP {
params.account_id, params.account_id,
Collection::Email, Collection::Email,
vec![ vec![
Filter::eq(Property::MessageId, message_id), Filter::eq(Property::MessageId, &message_id),
Filter::is_in_bitmap( Filter::is_in_bitmap(
Property::MailboxIds, Property::MailboxIds,
params.mailbox_ids.first().copied().unwrap_or(INBOX_ID), params.mailbox_ids.first().copied().unwrap_or(INBOX_ID),
@ -176,7 +176,7 @@ impl JMAP {
MessageIngest(MessageIngestEvent::Duplicate), MessageIngest(MessageIngestEvent::Duplicate),
SpanId = params.session_id, SpanId = params.session_id,
AccountId = params.account_id, AccountId = params.account_id,
MessageId = message_id.to_string(), MessageId = message_id,
); );
return Ok(IngestedEmail { return Ok(IngestedEmail {
@ -353,6 +353,7 @@ impl JMAP {
MailboxId = mailbox_ids_event, MailboxId = mailbox_ids_event,
BlobId = blob_id.hash.to_hex(), BlobId = blob_id.hash.to_hex(),
ChangeId = change_id, ChangeId = change_id,
MessageId = message_id,
Size = raw_message_len as u64, Size = raw_message_len as u64,
Elapsed = start_time.elapsed(), Elapsed = start_time.elapsed(),
); );