byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dmarc reject (#260)

Browse Source 
* Update data_post_headers documentation
We cannot reject at this stage, which is only there to alter headers.
Fix #258

* DMARC plugin: reject in data_post
Followup of #258: we cannot reject a connection during data_post_headers. So add a new hook in data_post to do the real rejection

* Add the dmarc_reject note on the transaction
It's probably possible to have one valid email after an invalid one using the same connection (even if not common)
This commit is contained in:
Daniel B 2016-05-03 19:41:53 +02:00 committed by Matt Simerson
parent 9748064889
commit 7ff45375f1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/dmarc
View File

@ -192,12 +192,12 @@ sub check_dmarc {
$self->adjust_karma(-3); $self->adjust_karma(-3);
# Add a mark now so the data_post hook can do the real reject # Add a mark now so the data_post hook can do the real reject
$self->connection->notes('reject_dmarc', '1'); $transaction->notes('reject_dmarc', '1');
} }
sub reject_dmarc { sub reject_dmarc {
my ($self, $transaction) = @_; my ($self, $transaction) = @_;
return $self->get_reject("failed DMARC policy") return $self->get_reject("failed DMARC policy")
if ($self->connection->notes('reject_dmarc')); if ($transaction->notes('reject_dmarc'));
return DECLINED; return DECLINED;
} }