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

Fix MTA: Process reports using original RCPT before rewriting.

Browse Source
This commit is contained in:
Maurus Decimus
2026-05-10 10:57:57 +02:00
parent b455951c11
commit aa2556621e
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/smtp/src/reporting/inbound.rs
View File

@@ -38,14 +38,20 @@ impl<T: AsyncWrite + AsyncRead + Unpin> Session<T> {
pub fn is_report(&self) -> bool {
for addr_match in &self.server.core.smtp.report.analysis.addresses {
for addr in &self.data.rcpt_to {
let rcpt_addr = addr
.dsn_info
.as_ref()
.and_then(|v| v.strip_prefix("rfc822;"))
.unwrap_or(&addr.address_lcase);
match addr_match {
AddressMatch::StartsWith(prefix) if addr.address_lcase.starts_with(prefix) => {
AddressMatch::StartsWith(prefix) if rcpt_addr.starts_with(prefix) => {
return true;
}
AddressMatch::EndsWith(suffix) if addr.address_lcase.ends_with(suffix) => {
AddressMatch::EndsWith(suffix) if rcpt_addr.ends_with(suffix) => {
return true;
}
AddressMatch::Equals(value) if addr.address_lcase.eq(value) => return true,
AddressMatch::Equals(value) if rcpt_addr.eq(value) => return true,
_ => (),
}
}