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

spf: switch header appending hook

Browse Source 
This doesn't really change anything, because the SPF plugin generally is listed in config/plugins before the `data_post` plugins that do content evaluation. This merely assures that regardless of the ordering of plugins in config/plugins, the SPF results header will be present.
This commit is contained in:
Matt Simerson 2014-12-30 14:17:16 -08:00
parent a515e2b17c
commit 993bd4e7df
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/sender_permitted_from
View File

@ -82,11 +82,11 @@ sub register {
if (!$self->{_args}{reject} && $self->qp->config('spfbehavior')) { if (!$self->{_args}{reject} && $self->qp->config('spfbehavior')) {
$self->{_args}{reject} = $self->qp->config('spfbehavior'); $self->{_args}{reject} = $self->qp->config('spfbehavior');
} }
$self->register_hook('mail', 'mail_handler'); $self->register_hook('mail', 'evaluate_spf');
$self->register_hook('data_post', 'data_post_handler'); $self->register_hook('data_post_headers', 'add_spf_header');
} }
sub mail_handler { sub evaluate_spf {
my ($self, $transaction, $sender, %param) = @_; my ($self, $transaction, $sender, %param) = @_;
if ( $self->is_immune() ) { if ( $self->is_immune() ) {
@ -244,12 +244,12 @@ sub handle_code_softfail {
return DECLINED; return DECLINED;
} }
sub data_post_handler { sub add_spf_header {
my ($self, $transaction) = @_; my ($self, $transaction) = @_;
my $result = $transaction->notes('spfquery') or return DECLINED; my $result = $transaction->notes('spfquery') or return DECLINED;
# if we skipped processing in mail_handler, we should skip here too # if we skipped processing in evaluate_spf, we should skip here too
return DECLINED if $self->is_immune(); return DECLINED if $self->is_immune();
$self->log(LOGDEBUG, "result was $result->code"); $self->log(LOGDEBUG, "result was $result->code");