Merge pull request #224 from fastmailops/too_big_report_fix

Reports: Fix the email sent when reports are too large
msimerson · Mar 13, 2024 · e61e268 · e61e268
2 parents fdda8f3 + 0ca1eab
commit e61e268
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/Mail/DMARC/Report/Sender.pm b/lib/Mail/DMARC/Report/Sender.pm
@@ -324,7 +324,9 @@ sub send_report {
         $report->store->delete_report($aggregate->metadata->report_id);
     }
     else {
-        $self->send_too_big_email(\@too_big, $xml_compressed_bytes, $aggregate);
+        my $send_errors = $report->config->{smtp}->{send_errors} // 1;
+        $self->send_too_big_email(\@too_big, $xml_compressed_bytes, $aggregate) if $send_errors;
+        $report->store->delete_report($aggregate->metadata->report_id);
     };
 
     alarm(0);
@@ -346,7 +348,7 @@ sub send_too_big_email {
                 report_domain=> $aggregate->policy_published->domain,
             }
         );
-        my $mime_object = $report->sendit->smtp->assemble_too_big_message_object($aggregate, $to, $body);
+        my $mime_object = $report->sendit->smtp->assemble_too_big_message_object($to, $body);
         $self->email({ to => $to, mime => $mime_object });
     };
     return;

diff --git a/share/mail-dmarc.ini b/share/mail-dmarc.ini
@@ -61,6 +61,11 @@ smarthost =
 smartuser =
 smartpass =
 
+; Send error report emails, if set, we will send a simple report to
+; any report handler when we were unable to send an aggregate report
+; This currently covers errors where the report was too large to send.
+send_errors = 1
+
 [imap]
 server    = mail.example.com
 port      = 993