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

spf plugin, added logging

Browse Source
This commit is contained in:
Matt Simerson 2012-05-07 03:36:02 -04:00 committed by Robert
parent fda2f4a730
commit 35f26c23bb
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
plugins/sender_permitted_from
View File

@ -26,17 +26,14 @@ See also http://spf.pobox.com/
=head1 AUTHOR =head1 AUTHOR
Matt Simerson <msimerson@cpan.org> Matt Simerson - 2011 - rewrote using Mail::SPF
=head1 ACKNOWLEDGEMENTS Matt Sergeant - 2003 - initial plugin
whomever wrote the original SPF plugin, upon which I based this.
=cut =cut
use strict; use strict;
use Mail::SPF 2.000; use Mail::SPF 2.000;
use Data::Dumper;
use Qpsmtpd::Constants; use Qpsmtpd::Constants;
sub register { sub register {
@ -48,9 +45,10 @@ sub hook_mail {
my ($self, $transaction, $sender, %param) = @_; my ($self, $transaction, $sender, %param) = @_;
my $format = $sender->format; my $format = $sender->format;
return (DECLINED, "SPF - null sender") if $format eq '<>'; if ( $format eq '<>' || ! $sender->host || ! $sender->user ) {
return (DECLINED, "SPF - null sender") $self->log( LOGDEBUG, "pass: null sender" );
unless ($sender->host && $sender->user); return (DECLINED, "SPF - null sender");
};
my $client_ip = $self->qp->connection->remote_ip; my $client_ip = $self->qp->connection->remote_ip;
my $from = $sender->user . '@' . lc($sender->host); my $from = $sender->user . '@' . lc($sender->host);
@ -58,18 +56,21 @@ sub hook_mail {
# If we are receiving from a relay permitted host, then we are probably # If we are receiving from a relay permitted host, then we are probably
# not the delivery system, and so we shouldn't check # not the delivery system, and so we shouldn't check
return (DECLINED, "SPF - relaying permitted") if ( $self->qp->connection->relay_client() ) {
if $self->qp->connection->relay_client(); $self->log( LOGDEBUG, "pass: relaying permitted (connection)" );
return (DECLINED, "SPF - relaying permitted")
};
my @relay_clients = $self->qp->config("relayclients"); my @relay_clients = $self->qp->config("relayclients");
my $more_relay_clients = $self->qp->config("morerelayclients", "map"); my $more_relay_clients = $self->qp->config("morerelayclients", "map");
my %relay_clients = map { $_ => 1 } @relay_clients; my %relay_clients = map { $_ => 1 } @relay_clients;
while ($client_ip) { while ($client_ip) {
return (DECLINED, "SPF - relaying permitted") if ( exists $relay_clients{$client_ip} ||
if exists $relay_clients{$client_ip}; exists $more_relay_clients->{$client_ip} ) {
return (DECLINED, "SPF - relaying permitted") $self->log( LOGDEBUG, "pass: relaying permitted (config)" );
if exists $more_relay_clients->{$client_ip}; return (DECLINED, "SPF - relaying permitted");
$client_ip =~ s/\d+\.?$// or last; # strip off another 8 bits };
$client_ip =~ s/\d+\.?$//; # strip off another 8 bits
} }
my $scope = $from ? 'mfrom' : 'helo'; my $scope = $from ? 'mfrom' : 'helo';
@ -96,7 +97,12 @@ sub hook_mail {
$transaction->notes('spfquery', $result); $transaction->notes('spfquery', $result);
$transaction->notes('spfcode', $result->code); $transaction->notes('spfcode', $result->code);
return (OK) if $result->code eq 'pass'; # this test passed if ( $result->code eq 'pass' ) { # this test passed
$self->log( LOGINFO, "pass" );
return (OK);
};
$self->log( LOGINFO, "fail: " . $result );
return (DECLINED, "SPF - $result->code"); return (DECLINED, "SPF - $result->code");
} }
@ -121,6 +127,7 @@ sub hook_rcpt {
if ($code eq "softfail") { if ($code eq "softfail") {
return (DENY, "SPF probable forgery: $why") if $deny > 1; return (DENY, "SPF probable forgery: $why") if $deny > 1;
return (DENYSOFT, "SPF probable forgery: $why");
} }
$self->log(LOGDEBUG, "result for $rcpt->address was $code: $why"); $self->log(LOGDEBUG, "result for $rcpt->address was $code: $why");
@ -135,8 +142,7 @@ sub hook_data_post {
$self->log(LOGDEBUG, "result was $result->code"); $self->log(LOGDEBUG, "result was $result->code");
$transaction->header->add('Received-SPF' => $result->received_spf_header, $transaction->header->add('Received-SPF' => $result->received_spf_header, 0);
0);
return DECLINED; return DECLINED;
} }