Support checking for early talkers at DATA
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@758 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
parent
2ef46f4694
commit
f4405d7a8c
@ -44,6 +44,13 @@ issued a deny or denysoft (depending on the value of I<action>). The default
|
|||||||
is to react at the SMTP greeting stage by issuing the apropriate response code
|
is to react at the SMTP greeting stage by issuing the apropriate response code
|
||||||
and terminating the SMTP connection.
|
and terminating the SMTP connection.
|
||||||
|
|
||||||
|
=item check-at [ CONNECT | DATA ]
|
||||||
|
|
||||||
|
Specifies when to check for early talkers. You can specify this option
|
||||||
|
multiple times to check more than once.
|
||||||
|
|
||||||
|
The default is I<check-at CONNECT> only.
|
||||||
|
|
||||||
=back
|
=back
|
||||||
|
|
||||||
=cut
|
=cut
|
||||||
@ -60,19 +67,33 @@ sub register {
|
|||||||
$self->log(LOGERROR, "Unrecognized/mismatched arguments");
|
$self->log(LOGERROR, "Unrecognized/mismatched arguments");
|
||||||
return undef;
|
return undef;
|
||||||
}
|
}
|
||||||
|
my %check_at;
|
||||||
|
for (0..$#args) {
|
||||||
|
next if $_ % 2;
|
||||||
|
if (lc($args[$_]) eq 'check-at') {
|
||||||
|
my $val = $args[$_ + 1];
|
||||||
|
$check_at{uc($val)}++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!%check_at) {
|
||||||
|
$check_at{CONNECT} = 1;
|
||||||
|
}
|
||||||
$self->{_args} = {
|
$self->{_args} = {
|
||||||
'wait' => 1,
|
'wait' => 1,
|
||||||
'action' => 'denysoft',
|
'action' => 'denysoft',
|
||||||
'defer-reject' => 0,
|
'defer-reject' => 0,
|
||||||
@args,
|
@args,
|
||||||
|
'check-at' => \%check_at,
|
||||||
};
|
};
|
||||||
if ( $qp->{conn} && $qp->{conn}->isa('Apache2::Connection')) {
|
if ( $qp->{conn} && $qp->{conn}->isa('Apache2::Connection')) {
|
||||||
require APR::Const;
|
require APR::Const;
|
||||||
APR::Const->import(qw(POLLIN SUCCESS));
|
APR::Const->import(qw(POLLIN SUCCESS));
|
||||||
$self->register_hook('connect', 'apr_connect_handler');
|
$self->register_hook('connect', 'apr_connect_handler');
|
||||||
|
$self->register_hook('data', 'apr_data_handler');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$self->register_hook('connect', 'connect_handler');
|
$self->register_hook('connect', 'connect_handler');
|
||||||
|
$self->register_hook('data', 'data_handler');
|
||||||
}
|
}
|
||||||
$self->register_hook('mail', 'mail_handler')
|
$self->register_hook('mail', 'mail_handler')
|
||||||
if $self->{_args}->{'defer-reject'};
|
if $self->{_args}->{'defer-reject'};
|
||||||
@ -82,6 +103,7 @@ sub register {
|
|||||||
sub apr_connect_handler {
|
sub apr_connect_handler {
|
||||||
my ($self, $transaction) = @_;
|
my ($self, $transaction) = @_;
|
||||||
|
|
||||||
|
return DECLINED unless $self->{_args}{'check-at'}{CONNECT};
|
||||||
return DECLINED if ($self->qp->connection->notes('whitelistclient'));
|
return DECLINED if ($self->qp->connection->notes('whitelistclient'));
|
||||||
my $ip = $self->qp->connection->remote_ip;
|
my $ip = $self->qp->connection->remote_ip;
|
||||||
|
|
||||||
@ -106,11 +128,35 @@ sub apr_connect_handler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub apr_data_handler {
|
||||||
|
my ($self, $transaction) = @_;
|
||||||
|
|
||||||
|
return DECLINED unless $self->{_args}{'check-at'}{DATA};
|
||||||
|
return DECLINED if ($self->qp->connection->notes('whitelistclient'));
|
||||||
|
my $ip = $self->qp->connection->remote_ip;
|
||||||
|
|
||||||
|
my $c = $self->qp->{conn};
|
||||||
|
my $socket = $c->client_socket;
|
||||||
|
my $timeout = $self->{_args}->{'wait'} * 1_000_000;
|
||||||
|
|
||||||
|
my $rc = $socket->poll($c->pool, $timeout, APR::Const::POLLIN());
|
||||||
|
if ($rc == APR::Const::SUCCESS()) {
|
||||||
|
$self->log(LOGNOTICE, "remote host started talking before we said hello [$ip]");
|
||||||
|
my $msg = 'Connecting host started transmitting before SMTP greeting';
|
||||||
|
return (DENY,$msg) if $self->{_args}->{'action'} eq 'deny';
|
||||||
|
return (DENYSOFT,$msg) if $self->{_args}->{'action'} eq 'denysoft';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$self->log(LOGINFO, "remote host said nothing spontaneous, proceeding");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sub connect_handler {
|
sub connect_handler {
|
||||||
my ($self, $transaction) = @_;
|
my ($self, $transaction) = @_;
|
||||||
my $in = new IO::Select;
|
my $in = new IO::Select;
|
||||||
my $ip = $self->qp->connection->remote_ip;
|
my $ip = $self->qp->connection->remote_ip;
|
||||||
|
|
||||||
|
return DECLINED unless $self->{_args}{'check-at'}{CONNECT};
|
||||||
return DECLINED
|
return DECLINED
|
||||||
if ($self->qp->connection->notes('whitelistclient'));
|
if ($self->qp->connection->notes('whitelistclient'));
|
||||||
|
|
||||||
@ -130,6 +176,28 @@ sub connect_handler {
|
|||||||
return DECLINED;
|
return DECLINED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub data_handler {
|
||||||
|
my ($self, $transaction) = @_;
|
||||||
|
my $in = new IO::Select;
|
||||||
|
my $ip = $self->qp->connection->remote_ip;
|
||||||
|
|
||||||
|
return DECLINED unless $self->{_args}{'check-at'}{DATA};
|
||||||
|
return DECLINED
|
||||||
|
if ($self->qp->connection->notes('whitelistclient'));
|
||||||
|
|
||||||
|
$in->add(\*STDIN) || return DECLINED;
|
||||||
|
if ($in->can_read($self->{_args}->{'wait'})) {
|
||||||
|
$self->log(LOGNOTICE, "remote host started talking before we said hello [$ip]");
|
||||||
|
my $msg = 'Connecting host started transmitting before SMTP greeting';
|
||||||
|
return (DENY,$msg) if $self->{_args}->{'action'} eq 'deny';
|
||||||
|
return (DENYSOFT,$msg) if $self->{_args}->{'action'} eq 'denysoft';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$self->log(LOGINFO, 'remote host said nothing spontaneous, proceeding');
|
||||||
|
}
|
||||||
|
return DECLINED;
|
||||||
|
}
|
||||||
|
|
||||||
sub mail_handler {
|
sub mail_handler {
|
||||||
my ($self, $txn) = @_;
|
my ($self, $txn) = @_;
|
||||||
my $msg = 'Connecting host started transmitting before SMTP greeting';
|
my $msg = 'Connecting host started transmitting before SMTP greeting';
|
||||||
|
Loading…
Reference in New Issue
Block a user