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

helo: improved invalid_localhost detection

Browse Source
This commit is contained in:
Matt Simerson 2014-09-10 15:12:52 -07:00
parent 91f8133f5c
commit 04a984bbab
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/helo
View File

@ -339,11 +339,14 @@ sub is_regex_match {
sub invalid_localhost { sub invalid_localhost {
my ($self, $host) = @_; my ($self, $host) = @_;
return if lc $host ne 'localhost';
if (Qpsmtpd::Utils->is_localhost($self->qp->connection->remote_ip)) { if (Qpsmtpd::Utils->is_localhost($self->qp->connection->remote_ip)) {
$self->log(LOGDEBUG, "pass, is localhost"); $self->log(LOGDEBUG, "pass, is localhost");
return; return;
} }
if ($host && lc $host eq 'localhost') {
$self->log(LOGDEBUG, "pass, host is localhost");
return;
};
#$self->log( LOGINFO, "fail, not localhost" ); #$self->log( LOGINFO, "fail, not localhost" );
return ("You are not localhost", "invalid localhost"); return ("You are not localhost", "invalid localhost");

27
t/plugin_tests/helo
View File

@ -11,7 +11,7 @@ sub register_tests {
$self->register_test('test_init_resolver', 2); $self->register_test('test_init_resolver', 2);
$self->register_test('test_is_in_badhelo', 2); $self->register_test('test_is_in_badhelo', 2);
$self->register_test('test_is_regex_match', 3); $self->register_test('test_is_regex_match', 3);
$self->register_test('test_invalid_localhost', 5); $self->register_test('test_invalid_localhost', 8);
$self->register_test('test_is_plain_ip', 3); $self->register_test('test_is_plain_ip', 3);
$self->register_test('test_is_address_literal', 3); $self->register_test('test_is_address_literal', 3);
$self->register_test('test_no_forward_dns', 2); $self->register_test('test_no_forward_dns', 2);
@ -50,7 +50,7 @@ sub test_is_regex_match {
my ($err, $why) = $self->is_regex_match('yahoo.com', 'ya.oo\.com$' ); my ($err, $why) = $self->is_regex_match('yahoo.com', 'ya.oo\.com$' );
ok( $err, "yahoo.com, $why"); ok( $err, "yahoo.com, $why");
($err, $why) = $self->is_regex_match('yoda.com', 'ya.oo\.com$' ); ($err, $why) = $self->is_regex_match('yoda.com', 'ya.oo\.com$' );
ok( ! $err, "yahoo.com"); ok( ! $err, "yahoo.com");
@ -61,21 +61,20 @@ sub test_is_regex_match {
sub test_invalid_localhost { sub test_invalid_localhost {
my $self = shift; my $self = shift;
$self->qp->connection->remote_ip(undef); my ($err, $why);
my ($err, $why) = $self->invalid_localhost('localhost' ); foreach my $ip ( undef, '', '192.0.99.5' ) {
ok( $err, "localhost, undefined remote IP: $why"); $self->qp->connection->remote_ip(undef);
($err, $why) = $self->invalid_localhost('localhost' );
$self->qp->connection->remote_ip(''); ok(!$err, "host: localhost, remote ip: $ip");
($err, $why) = $self->invalid_localhost('localhost' );
ok( $err, "localhost, empty remote IP: $why");
$self->qp->connection->remote_ip('192.0.99.5'); $self->qp->connection->remote_ip(undef);
($err, $why) = $self->invalid_localhost('localhost'); ($err, $why) = $self->invalid_localhost('not-localhost');
ok( $err, "localhost, invalid remote IP: $why"); ok($err, "host: not-localhost, remote ip: $ip");
};
foreach my $ip (qw/ ::1 127.0.0.1 / ) { foreach my $ip (qw/ ::1 127.0.0.1 / ) {
$self->qp->connection->remote_ip($ip); $self->qp->connection->remote_ip($ip);
($err, $why) = $self->invalid_localhost('localhost'); ($err, $why) = $self->invalid_localhost('not-localhost');
ok( ! $err, "localhost, correct remote IP ($ip)"); ok( ! $err, "localhost, correct remote IP ($ip)");
} }
}; };
@ -111,7 +110,7 @@ sub test_no_forward_dns {
my ($err, $why) = $self->no_forward_dns('perl.org'); my ($err, $why) = $self->no_forward_dns('perl.org');
ok( ! $err, "perl.org"); ok( ! $err, "perl.org");
# reserved .test TLD: http://tools.ietf.org/html/rfc2606 # reserved .test TLD: http://tools.ietf.org/html/rfc2606
($err, $why) = $self->no_forward_dns('perl.org.test'); ($err, $why) = $self->no_forward_dns('perl.org.test');
ok( $err, "test.perl.org.test"); ok( $err, "test.perl.org.test");