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

Possibility to set the number of "strikes" for the karma plugin (#254)

Browse Source 
The default behaviour (connection needs to have at least 3 or -3 to be considered
nice or naughty) is not always what we want, depending on the number of plugins
which adjust the karma. Lets make it configurable
This commit is contained in:
Daniel B 2016-04-20 19:52:47 +02:00 committed by Matt Simerson
parent 260bd6cdd6
commit 5e157d2344
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/karma
View File

@ -50,6 +50,16 @@ With the default negative limit of one, there's a very small chance you could
penalize a "mostly good" sender. Raising it to 2 reduces that possibility to penalize a "mostly good" sender. Raising it to 2 reduces that possibility to
improbable. improbable.
=head2 strikes <integer>
How many strikes are needed to consider the connection nice or naughty.
Various plugins can adjust the karma (see USING KARMA IN OTHER PLUGINS).
For example, with the default value of 3, if the karma of this message is 3
or above, the connection is considered to be a nice one. If it's -3 or less,
it's considered a naughty one. Between -2 and +2 it's neutral
Default: 3
=head2 penalty_days <days> =head2 penalty_days <days>
The number of days a naughty sender is refused connections. Use a decimal The number of days a naughty sender is refused connections. Use a decimal
@ -238,6 +248,7 @@ sub register {
$self->log(LOGERROR, "Bad arguments") if @_ % 2; $self->log(LOGERROR, "Bad arguments") if @_ % 2;
$self->{_args} = {@_}; $self->{_args} = {@_};
$self->{_args}{negative} ||= 1; $self->{_args}{negative} ||= 1;
$self->{_args}{strikes} ||= 3;
$self->{_args}{penalty_days} ||= 1; $self->{_args}{penalty_days} ||= 1;
$self->{_args}{reject_type} ||= 'disconnect'; $self->{_args}{reject_type} ||= 'disconnect';
@ -428,7 +439,7 @@ sub disconnect_handler {
my $history = ($nice || 0) - $naughty; my $history = ($nice || 0) - $naughty;
my $log_mess = ''; my $log_mess = '';
if ($karma < -2) { # they achieved at least 2 strikes if ($karma <= $self->{_args}{strikes}) { # Enough negative strikes ?
$history--; $history--;
my $negative_limit = 0 - $self->{_args}{negative}; my $negative_limit = 0 - $self->{_args}{negative};
if ($history <= $negative_limit) { if ($history <= $negative_limit) {
@ -445,7 +456,7 @@ sub disconnect_handler {
$log_mess = "negative"; $log_mess = "negative";
} }
} }
elsif ($karma > 2) { elsif ($karma >= $self->{_args}{strikes}) {
$nice++; $nice++;
$log_mess = "positive"; $log_mess = "positive";
} }