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

added logging and tests to check_badmailfrom

Browse Source 
refactored several checks out of hook_mail and added LOGDEBUG

added tests for is_immune method
This commit is contained in:
Matt Simerson 2012-05-05 00:27:16 -04:00 committed by Robert
parent 312d983ff7
commit 0c7ee4941b
2 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/check_badmailfrom
View File

@ -58,15 +58,13 @@ sub hook_mail {
@badmailfrom = @{$self->{_badmailfrom_config}}; @badmailfrom = @{$self->{_badmailfrom_config}};
}; };
return DECLINED if ! scalar @badmailfrom; return DECLINED if $self->is_immune( $sender, \@badmailfrom );
return DECLINED if $sender->format eq '<>';
return DECLINED if ! $sender->host || ! $sender->user;
my $host = lc $sender->host; my $host = lc $sender->host;
my $from = lc($sender->user) . '@' . $host; my $from = lc($sender->user) . '@' . $host;
for my $config (@badmailfrom) { for my $config (@badmailfrom) {
$config =~ s/^\s+//g; # trim any leading whitespace $config =~ s/^\s+//g; # trim leading whitespace
my ($bad, $reason) = split /\s+/, $config, 2; my ($bad, $reason) = split /\s+/, $config, 2;
next unless $bad; next unless $bad;
next unless $self->is_match( $from, $bad, $host ); next unless $self->is_match( $from, $bad, $host );
@ -105,3 +103,24 @@ sub hook_rcpt {
$self->log(LOGINFO, $note); $self->log(LOGINFO, $note);
return (DENY, $note); return (DENY, $note);
} }
sub is_immune {
my ($self, $sender, $badmf ) = @_;
if ( ! scalar @$badmf ) {
$self->log(LOGDEBUG, 'skip: empty list');
return 1;
};
if ( ! $sender || $sender->format eq '<>' ) {
$self->log(LOGDEBUG, 'skip: null sender');
return 1;
};
if ( ! $sender->host || ! $sender->user ) {
$self->log(LOGDEBUG, 'skip: missing user or host');
return 1;
};
return;
};

29
t/plugin_tests/check_badmailfrom
View File

@ -1,3 +1,4 @@
#!perl -w
use strict; use strict;
use Data::Dumper; use Data::Dumper;
@ -7,11 +8,38 @@ use Qpsmtpd::Address;
sub register_tests { sub register_tests {
my $self = shift; my $self = shift;
$self->register_test("test_badmailfrom_is_immune", 5);
$self->register_test("test_badmailfrom_match", 7); $self->register_test("test_badmailfrom_match", 7);
$self->register_test("test_badmailfrom_hook_mail", 4); $self->register_test("test_badmailfrom_hook_mail", 4);
$self->register_test("test_badmailfrom_hook_rcpt", 2); $self->register_test("test_badmailfrom_hook_rcpt", 2);
} }
sub test_badmailfrom_is_immune {
my $self = shift;
my $transaction = $self->qp->transaction;
my $test_email = 'matt@test.com';
my $address = Qpsmtpd::Address->new( "<$test_email>" );
$transaction->sender($address);
ok( $self->is_immune( $transaction->sender, [] ), "is_immune, empty list");
$address = Qpsmtpd::Address->new( '<>' );
$transaction->sender($address);
ok( $self->is_immune( $transaction->sender, ['bad@example.com'] ), "is_immune, null sender");
$address = Qpsmtpd::Address->new( '<matt@>' );
$transaction->sender($address);
ok( $self->is_immune( $transaction->sender, ['bad@example.com'] ), "is_immune, missing host");
$address = Qpsmtpd::Address->new( '<@example.com>' );
$transaction->sender($address);
ok( $self->is_immune( $transaction->sender, ['bad@example.com'] ), "is_immune, missing user");
$address = Qpsmtpd::Address->new( '<matt@example.com>' );
$transaction->sender($address);
ok( ! $self->is_immune( $transaction->sender, ['bad@example.com'] ), "is_immune, false");
};
sub test_badmailfrom_hook_mail { sub test_badmailfrom_hook_mail {
my $self = shift; my $self = shift;
@ -77,4 +105,3 @@ sub test_badmailfrom_match {
"check_badmailfrom pattern non-match"); "check_badmailfrom pattern non-match");
}; };