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

2x: use Utils->is_localhost() to detect loopback

Browse Source 
* it's IPv6 compatible
* plugins/helo, plugins/fcrdns
This commit is contained in:
Matt Simerson 2014-09-10 13:47:34 -07:00
parent 2466a88cb2
commit 91f8133f5c
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/fcrdns
View File

@ -152,7 +152,7 @@ sub connect_handler {
return DECLINED if $self->is_immune(); return DECLINED if $self->is_immune();
# run a couple cheap tests before the more expensive DNS tests # run a couple cheap tests before the more expensive DNS tests
foreach my $test (qw/ invalid_localhost is_not_fqdn /) { foreach my $test (qw/ is_valid_localhost is_not_fqdn /) {
$self->$test() or return DECLINED; $self->$test() or return DECLINED;
} }
@ -163,19 +163,24 @@ sub connect_handler {
return DECLINED; return DECLINED;
} }
sub invalid_localhost { sub is_valid_localhost {
my ($self) = @_; my ($self) = @_;
return 1 if lc $self->qp->connection->remote_host ne 'localhost';
if ( $self->qp->connection->remote_ip ne '127.0.0.1' if (Qpsmtpd::Utils->is_localhost($self->qp->connection->remote_ip)) {
&& $self->qp->connection->remote_ip ne '::1')
{
$self->adjust_karma(-1);
$self->log(LOGINFO, "fail, not localhost");
return;
}
$self->adjust_karma(1); $self->adjust_karma(1);
$self->log(LOGDEBUG, "pass, is localhost"); $self->log(LOGDEBUG, "pass, is localhost");
return 1; return 1;
};
my $rh = $self->qp->connection->remote_host;
if ($rh && lc $self->qp->connection->remote_host eq 'localhost') {
$self->log(LOGDEBUG, "pass, remote_host is localhost");
return 1;
};
$self->adjust_karma(-1);
$self->log(LOGINFO, "fail, not localhost");
return;
} }
sub is_not_fqdn { sub is_not_fqdn {

3
plugins/helo
View File

@ -340,8 +340,7 @@ sub is_regex_match {
sub invalid_localhost { sub invalid_localhost {
my ($self, $host) = @_; my ($self, $host) = @_;
return if lc $host ne 'localhost'; return if lc $host ne 'localhost';
my $ip = $self->qp->connection->remote_ip; if (Qpsmtpd::Utils->is_localhost($self->qp->connection->remote_ip)) {
if ($ip && ($ip eq '127.0.0.1' || $ip eq '::1')) {
$self->log(LOGDEBUG, "pass, is localhost"); $self->log(LOGDEBUG, "pass, is localhost");
return; return;
} }