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

rcpt_ok: do immunity checks earlier, so that

Browse Source 
disposition logs don't indicate failure for authenticated senders
This commit is contained in:
Matt Simerson 2013-04-24 16:31:00 -04:00
parent b3ca4e3ccc
commit e3d8a7030e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/rcpt_ok
View File

@ -6,18 +6,18 @@ rcpt_ok
=head1 SYNOPSIS =head1 SYNOPSIS
this plugin checks the standard rcpthosts config Validate that we accept mail for a recipient using a qmail rcpthosts file
=head1 DESCRIPTION =head1 DESCRIPTION
Check the recipient hostname and determine if we accept mail to that host. Check the envelope recipient hostname and determine if we accept mail to that host.
This is functionally identical to qmail's rcpthosts implementation, consulting This is functionally identical to qmail's rcpthosts implementation, consulting
both rcpthosts and morercpthosts.cdb. both rcpthosts and morercpthosts.cdb.
=head1 CONFIGURATION =head1 CONFIGURATION
It should be configured to be run _LAST_! It should be configured as the _LAST_ recipient plugin!
=cut =cut
@ -30,6 +30,8 @@ use Qpsmtpd::DSN;
sub hook_rcpt { sub hook_rcpt {
my ($self, $transaction, $recipient, %param) = @_; my ($self, $transaction, $recipient, %param) = @_;
return (OK) if $self->is_immune(); # relay_client or whitelist
# Allow 'no @' addresses for 'postmaster' and 'abuse' # Allow 'no @' addresses for 'postmaster' and 'abuse'
# qmail-smtpd will do this for all users without a domain, but we'll # qmail-smtpd will do this for all users without a domain, but we'll
# be a bit more picky. Maybe that's a bad idea. # be a bit more picky. Maybe that's a bad idea.
@ -37,7 +39,6 @@ sub hook_rcpt {
return (OK) if $self->is_in_rcpthosts($host); return (OK) if $self->is_in_rcpthosts($host);
return (OK) if $self->is_in_morercpthosts($host); return (OK) if $self->is_in_morercpthosts($host);
return (OK) if $self->qp->connection->relay_client; # failsafe
# default of relaying_denied is obviously DENY, # default of relaying_denied is obviously DENY,
# we use the default "Relaying denied" message... # we use the default "Relaying denied" message...