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

naughty: support reject_type set by original plugin

Browse Source 
that marked the connection as naughty
This commit is contained in:
Matt Simerson 2012-06-23 00:46:39 -04:00
parent 5dbc47ed1a
commit 4761e3f41a
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/naughty
View File

@ -7,8 +7,8 @@ naughty - dispose of naughty connections
=head1 BACKGROUND =head1 BACKGROUND
Rather than immediately terminating naughty connections, plugins often mark Rather than immediately terminating naughty connections, plugins often mark
the connections and dispose of them later. Examples are B<dnsbl>, B<karma>, the connections and dispose of them later. Examples are B<dnsbl>, B<karma>,
B<greylisting>, B<resolvable_fromhost> and B<SPF>. B<greylisting>, B<resolvable_fromhost> and B<SPF>.
This practice is based on RFC standards and the belief that malware will retry This practice is based on RFC standards and the belief that malware will retry
less if we disconnect after RCPT. This may have been true, and may still be, less if we disconnect after RCPT. This may have been true, and may still be,
@ -44,7 +44,7 @@ connections, regardless of who identified them, exactly when you choose.
=head2 simplicity =head2 simplicity
Rather than having plugins split processing across hooks, they can run to Rather than having plugins split processing across hooks, they can run to
completion when they have the information they need, issue a completion when they have the information they need, issue a
I<reject naughty> if warranted, and be done. I<reject naughty> if warranted, and be done.
This may help reduce the code divergence between the sync and async This may help reduce the code divergence between the sync and async
@ -88,7 +88,8 @@ from detecting address validity.
=head2 reject_type [ temp | perm | disconnect ] =head2 reject_type [ temp | perm | disconnect ]
What type of rejection should be sent? See docs/config.pod If the plugin that set naughty didn't specify, what type of rejection should
be sent? See docs/config.pod
=head2 loglevel =head2 loglevel
@ -99,7 +100,7 @@ Adjust the quantity of logging for this plugin. See docs/logging.pod
Here's how to use naughty and get_reject in your plugin: Here's how to use naughty and get_reject in your plugin:
sub register { sub register {
my ($self,$qp) = shift, shift; my ($self, $qp) = (shift, shift);
$self->{_args} = { @_ }; $self->{_args} = { @_ };
$self->{_args}{reject} ||= 'naughty'; $self->{_args}{reject} ||= 'naughty';
}; };
@ -123,14 +124,14 @@ use warnings;
use Qpsmtpd::Constants; use Qpsmtpd::Constants;
sub register { sub register {
my ($self, $qp ) = shift, shift; my ($self, $qp) = (shift, shift);
$self->log(LOGERROR, "Bad arguments") if @_ % 2; $self->log(LOGERROR, "Bad arguments") if @_ % 2;
$self->{_args} = { @_ }; $self->{_args} = { @_ };
$self->{_args}{reject} ||= 'rcpt'; $self->{_args}{reject} ||= 'rcpt';
$self->{_args}{reject_type} ||= 'disconnect'; $self->{_args}{reject_type} ||= 'disconnect';
my $reject = lc $self->{_args}{reject}; my $reject = lc $self->{_args}{reject};
my %hooks = map { $_ => 1 } my %hooks = map { $_ => 1 }
qw/ connect mail rcpt data data_post hook_queue_post /; qw/ connect mail rcpt data data_post hook_queue_post /;
if ( ! $hooks{$reject} ) { if ( ! $hooks{$reject} ) {
@ -156,6 +157,8 @@ sub naughty {
return DECLINED; return DECLINED;
}; };
$self->log(LOGINFO, "disconnecting"); $self->log(LOGINFO, "disconnecting");
return ( $self->get_reject_type(), $naughty ); my $type = $self->get_reject_type( 'disconnect',
$self->connection->notes('naughty_reject_type') );
return ( $type, $naughty );
}; };