mirrors/mail-server
1
0
Fork 0
mirror of https://github.com/stalwartlabs/mail-server.git synced 2024-12-01 01:43:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Avoid sending reports for DMARC/delivery reports (closes #173)

Browse source
This commit is contained in:
mdecimus 2024-07-06 11:14:03 +02:00
parent be8f23296d
commit af89725d20
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/smtp/src/inbound/data.rs
View file

@ -239,6 +239,7 @@ impl<T: SessionStream> Session<T> {
}
// Verify DMARC
let is_report = self.is_report();
let (dmarc_result, dmarc_policy) = match &self.data.spf_mail_from {
Some(spf_output) if dmarc.verify() => {
let dmarc_output = self
@ -301,7 +302,7 @@ impl<T: SessionStream> Session<T> {
}
// Send DMARC report
if dmarc_output.requested_reports() {
if dmarc_output.requested_reports() && !is_report {
self.send_dmarc_report(
&auth_message,
&auth_results,
@ -330,7 +331,7 @@ impl<T: SessionStream> Session<T> {
};
// Analyze reports
if self.is_report() {
if is_report {
self.core.analyze_report(raw_message.clone());
if !rc.analysis.forward {
self.data.messages_sent += 1;