filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix MTA: Expand lists and resolve catch-all addresses when building autogenerated messages

Browse Source
This commit is contained in:
Maurus Decimus
2026-05-26 19:07:33 +02:00
parent 9b72c0a32b
commit dc4191a542
6 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/smtp/src/queue/dsn.rs
View File

@@ -39,7 +39,7 @@ impl SendDsn for Server {
if let Some(dsn) = message.build_dsn(self).await {
let mut dsn_message = self.new_message("", message.span_id);
dsn_message
.add_recipient(message.message.return_path.as_ref(), self)
.expand_and_add_recipient(message.message.return_path.as_ref(), self)
.await;
// Sign message

35
crates/smtp/src/queue/spool.rs
View File

@@ -16,6 +16,7 @@ use crate::queue::{
use ahash::AHashSet;
use common::config::smtp::queue::{ArchivedQueueExpiry, QueueName};
use common::ipc::QueueEvent;
use common::network::RcptResolution;
use common::{KV_LOCK_QUEUE_MESSAGE, Server};
use registry::schema::prelude::{ObjectType, Property};
use registry::schema::structs::SpamTrainingSample;
@@ -568,9 +569,37 @@ impl MessageWrapper {
true
}
pub async fn add_recipient(&mut self, rcpt: impl AsRef<str>, server: &Server) {
// Resolve queue
self.message.recipients.push(Recipient::new(rcpt));
pub async fn expand_and_add_recipient(&mut self, rcpt: impl AsRef<str>, server: &Server) {
let rcpt = rcpt.as_ref();
match server
.rcpt_resolve(&rcpt.to_lowercase(), self.span_id)
.await
{
Ok(RcptResolution::Rewrite(rewritten)) => {
self.add_expanded_recipient(&rewritten, server).await;
}
Ok(RcptResolution::Expand(addrs)) => {
for addr in addrs.as_ref() {
self.add_expanded_recipient(addr, server).await;
}
}
Ok(_) => {
self.add_expanded_recipient(rcpt, server).await;
}
Err(err) => {
trc::error!(
err.span_id(self.span_id)
.caused_by(trc::location!())
.details("Failed to resolve recipient.")
.ctx(trc::Key::To, rcpt.to_string())
);
self.add_expanded_recipient(rcpt, server).await;
}
}
}
pub async fn add_expanded_recipient(&mut self, rcpt: impl AsRef<str>, server: &Server) {
self.message.recipients.push(Recipient::new(rcpt.as_ref()));
let queue = server.get_queue_or_default(
&server
.eval_if::<String, _>(