Compare commits
No commits in common. 'c9' and 'i8c' have entirely different histories.
@ -0,0 +1,193 @@
|
||||
diff --git a/MANIFEST b/MANIFEST
|
||||
index e16e0da..601f886 100644
|
||||
--- a/MANIFEST
|
||||
+++ b/MANIFEST
|
||||
@@ -101,7 +101,6 @@ lib/Mail/SpamAssassin/Plugin/Pyzor.pm
|
||||
lib/Mail/SpamAssassin/Plugin/Razor2.pm
|
||||
lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
|
||||
lib/Mail/SpamAssassin/Plugin/RelayEval.pm
|
||||
-lib/Mail/SpamAssassin/Plugin/ResourceLimits.pm
|
||||
lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm
|
||||
lib/Mail/SpamAssassin/Plugin/Reuse.pm
|
||||
lib/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
|
||||
diff --git a/lib/Mail/SpamAssassin/Plugin/ResourceLimits.pm b/lib/Mail/SpamAssassin/Plugin/ResourceLimits.pm
|
||||
deleted file mode 100644
|
||||
index 9179b93..0000000
|
||||
--- a/lib/Mail/SpamAssassin/Plugin/ResourceLimits.pm
|
||||
+++ /dev/null
|
||||
@@ -1,143 +0,0 @@
|
||||
-# <@LICENSE>
|
||||
-# Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
-# contributor license agreements. See the NOTICE file distributed with
|
||||
-# this work for additional information regarding copyright ownership.
|
||||
-# The ASF licenses this file to you under the Apache License, Version 2.0
|
||||
-# (the "License"); you may not use this file except in compliance with
|
||||
-# the License. You may obtain a copy of the License at:
|
||||
-#
|
||||
-# http://www.apache.org/licenses/LICENSE-2.0
|
||||
-#
|
||||
-# Unless required by applicable law or agreed to in writing, software
|
||||
-# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
-# See the License for the specific language governing permissions and
|
||||
-# limitations under the License.
|
||||
-# </@LICENSE>
|
||||
-
|
||||
-=head1 NAME
|
||||
-
|
||||
-Mail::SpamAssassin::Plugin::ResourceLimits - Limit the memory and/or CPU of child spamd processes
|
||||
-
|
||||
-=head1 SYNOPSIS
|
||||
-
|
||||
- # This plugin is for admin only and cannot be specified in user config.
|
||||
- loadplugin Mail::SpamAssassin::Plugin::ResourceLimits
|
||||
-
|
||||
- # Sets to RLIMIT_CPU from BSD::Resource. The quota is based on max CPU Time seconds.
|
||||
- resource_limit_cpu 120
|
||||
-
|
||||
- # Sets to RLIMIT_RSS and RLIMIT_AS via BSD::Resource.
|
||||
- resource_limit_cpu 536870912
|
||||
-
|
||||
-=head1 DESCRIPTION
|
||||
-
|
||||
-This module leverages BSD::Resource to assure your spamd child processes do not exceed
|
||||
-specified CPU or memory limit. If this happens, the child process will die.
|
||||
-See the L<BSD::Resource> for more details.
|
||||
-
|
||||
-NOTE: Because this plugin uses BSD::Resource, it will not function on Windows.
|
||||
-
|
||||
-=head1 ADMINISTRATOR SETTINGS
|
||||
-
|
||||
-=over 4
|
||||
-
|
||||
-=item resource_limit_cpu 120 (default: 0 or no limit)
|
||||
-
|
||||
-How many cpu cycles are allowed on this process before it dies.
|
||||
-
|
||||
-=item resource_limit_mem 536870912 (default: 0 or no limit)
|
||||
-
|
||||
-The maximum number of bytes of memory allowed both for:
|
||||
-
|
||||
-=over
|
||||
-
|
||||
-=item *
|
||||
-
|
||||
-(virtual) address space bytes
|
||||
-
|
||||
-=item *
|
||||
-
|
||||
-resident set size
|
||||
-
|
||||
-=back
|
||||
-
|
||||
-=back
|
||||
-
|
||||
-=cut
|
||||
-
|
||||
-package Mail::SpamAssassin::Plugin::ResourceLimits;
|
||||
-
|
||||
-use Mail::SpamAssassin::Plugin ();
|
||||
-use Mail::SpamAssassin::Logger ();
|
||||
-use Mail::SpamAssassin::Util ();
|
||||
-use Mail::SpamAssassin::Constants qw(:sa);
|
||||
-
|
||||
-use strict;
|
||||
-use warnings;
|
||||
-
|
||||
-use BSD::Resource qw(RLIMIT_RSS RLIMIT_AS RLIMIT_CPU);
|
||||
-
|
||||
-our @ISA = qw(Mail::SpamAssassin::Plugin);
|
||||
-
|
||||
-sub new {
|
||||
- my $class = shift;
|
||||
- my $mailsaobject = shift;
|
||||
-
|
||||
- $class = ref($class) || $class;
|
||||
- my $self = $class->SUPER::new($mailsaobject);
|
||||
- bless( $self, $class );
|
||||
-
|
||||
- $self->set_config( $mailsaobject->{conf} );
|
||||
- return $self;
|
||||
-}
|
||||
-
|
||||
-sub set_config {
|
||||
- my ( $self, $conf ) = @_;
|
||||
- my @cmds = ();
|
||||
-
|
||||
- push(
|
||||
- @cmds,
|
||||
- {
|
||||
- setting => 'resource_limit_mem',
|
||||
- is_admin => 1,
|
||||
- default => '0',
|
||||
- type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC
|
||||
- }
|
||||
- );
|
||||
-
|
||||
- push(
|
||||
- @cmds,
|
||||
- {
|
||||
- setting => 'resource_limit_cpu',
|
||||
- is_admin => 1,
|
||||
- default => '0',
|
||||
- type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC
|
||||
- }
|
||||
- );
|
||||
-
|
||||
- $conf->{parser}->register_commands( \@cmds );
|
||||
-}
|
||||
-
|
||||
-sub spamd_child_init {
|
||||
- my ($self) = @_;
|
||||
-
|
||||
- # Set CPU Resource limits if they were specified.
|
||||
- Mail::SpamAssassin::Util::dbg("resourcelimitplugin: In spamd_child_init");
|
||||
- Mail::SpamAssassin::Util::dbg( "resourcelimitplugin: cpu limit: " . $self->{main}->{conf}->{resource_limit_cpu} );
|
||||
- if ( $self->{main}->{conf}->{resource_limit_cpu} ) {
|
||||
- BSD::Resource::setrlimit( RLIMIT_CPU, $self->{main}->{conf}->{resource_limit_cpu}, $self->{main}->{conf}->{resource_limit_cpu} )
|
||||
- || info("resourcelimitplugin: Unable to set RLIMIT_CPU");
|
||||
- }
|
||||
-
|
||||
- # Set Resource limits if they were specified.
|
||||
- Mail::SpamAssassin::Util::dbg( "resourcelimitplugin: mem limit: " . $self->{main}->{conf}->{resource_limit_mem} );
|
||||
- if ( $self->{main}->{conf}->{resource_limit_mem} ) {
|
||||
- BSD::Resource::setrlimit( RLIMIT_RSS, $self->{main}->{conf}->{resource_limit_mem}, $self->{main}->{conf}->{resource_limit_mem} )
|
||||
- || info("resourcelimitplugin: Unable to set RLIMIT_RSS");
|
||||
- BSD::Resource::setrlimit( RLIMIT_AS, $self->{main}->{conf}->{resource_limit_mem}, $self->{main}->{conf}->{resource_limit_mem} )
|
||||
- || info("resourcelimitplugin: Unable to set RLIMIT_AS");
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-1;
|
||||
diff --git a/lib/Mail/SpamAssassin/Util/DependencyInfo.pm b/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
|
||||
index b5b05cf..8223b26 100644
|
||||
--- a/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
|
||||
+++ b/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
|
||||
@@ -234,12 +234,6 @@ our @OPTIONAL_MODULES = (
|
||||
check for both Net::DNS and Net::DNS::Nameserver. However,
|
||||
Net::DNS::Nameserver is only used in make test as of June 2014.',
|
||||
},
|
||||
-{
|
||||
- module => 'BSD::Resource',
|
||||
- version => 0,
|
||||
- desc => 'BSD::Resource provides BSD process resource limit and priority
|
||||
- functions. It is used by the optional ResourceLimits Plugin.',
|
||||
-},
|
||||
{
|
||||
module => 'Archive::Zip',
|
||||
version => 0,
|
||||
diff --git a/rules/v342.pre b/rules/v342.pre
|
||||
index 8e0fb07..c4758e9 100644
|
||||
--- a/rules/v342.pre
|
||||
+++ b/rules/v342.pre
|
||||
@@ -19,10 +19,6 @@
|
||||
# HashBL - Query hashed/unhashed strings, emails, uris etc from DNS lists
|
||||
# loadplugin Mail::SpamAssassin::Plugin::HashBL
|
||||
|
||||
-# ResourceLimits - assure your spamd child processes
|
||||
-# do not exceed specified CPU or memory limit
|
||||
-# loadplugin Mail::SpamAssassin::Plugin::ResourceLimits
|
||||
-
|
||||
# FromNameSpoof - help stop spam that tries to spoof other domains using
|
||||
# the from name
|
||||
# loadplugin Mail::SpamAssassin::Plugin::FromNameSpoof
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,40 @@
|
||||
diff --git a/t/all_modules.t b/t/all_modules.t
|
||||
index 855395f..a976012 100755
|
||||
--- a/t/all_modules.t
|
||||
+++ b/t/all_modules.t
|
||||
@@ -12,15 +12,7 @@ plan tests => 5;
|
||||
|
||||
my $plugins = '';
|
||||
|
||||
-if (eval { require BSD::Resource; }) {
|
||||
- $plugins .= "loadplugin Mail::SpamAssassin::Plugin::ResourceLimits\n"
|
||||
-}
|
||||
-if (eval { require Net::CIDR::Lite; }) {
|
||||
- $plugins .= "loadplugin Mail::SpamAssassin::Plugin::URILocalBL\n";
|
||||
-}
|
||||
-
|
||||
tstpre ("
|
||||
-loadplugin Mail::SpamAssassin::Plugin::RelayCountry
|
||||
loadplugin Mail::SpamAssassin::Plugin::URIDNSBL
|
||||
loadplugin Mail::SpamAssassin::Plugin::Hashcash
|
||||
loadplugin Mail::SpamAssassin::Plugin::SPF
|
||||
diff --git a/t/data/01_test_rules.pre b/t/data/01_test_rules.pre
|
||||
index c4681ca..1694ddf 100644
|
||||
--- a/t/data/01_test_rules.pre
|
||||
+++ b/t/data/01_test_rules.pre
|
||||
@@ -21,7 +21,6 @@ loadplugin Mail::SpamAssassin::Plugin::WLBLEval
|
||||
loadplugin Mail::SpamAssassin::Plugin::VBounce
|
||||
|
||||
# Try to load some non-default plugins also
|
||||
-loadplugin Mail::SpamAssassin::Plugin::RelayCountry
|
||||
loadplugin Mail::SpamAssassin::Plugin::DCC
|
||||
loadplugin Mail::SpamAssassin::Plugin::AntiVirus
|
||||
loadplugin Mail::SpamAssassin::Plugin::AWL
|
||||
@@ -32,7 +31,6 @@ loadplugin Mail::SpamAssassin::Plugin::Shortcircuit
|
||||
loadplugin Mail::SpamAssassin::Plugin::ASN
|
||||
#loadplugin Mail::SpamAssassin::Plugin::PhishTag
|
||||
#loadplugin Mail::SpamAssassin::Plugin::TxRep
|
||||
-loadplugin Mail::SpamAssassin::Plugin::URILocalBL
|
||||
loadplugin Mail::SpamAssassin::Plugin::PDFInfo
|
||||
loadplugin Mail::SpamAssassin::Plugin::HashBL
|
||||
#loadplugin Mail::SpamAssassin::Plugin::ResourceLimits
|
||||
@ -0,0 +1,354 @@
|
||||
diff --git a/lib/Mail/SpamAssassin/AutoWhitelist.pm b/lib/Mail/SpamAssassin/AutoWhitelist.pm
|
||||
index 627e249..cc3c97b 100644
|
||||
--- a/lib/Mail/SpamAssassin/AutoWhitelist.pm
|
||||
+++ b/lib/Mail/SpamAssassin/AutoWhitelist.pm
|
||||
@@ -128,35 +128,35 @@ sub check_address {
|
||||
my $entry = $self->{checker}->get_addr_entry ($fulladdr, $signedby);
|
||||
$self->{entry} = $entry;
|
||||
|
||||
- if (!$entry->{msgcount}) {
|
||||
+ if (!$entry->{count}) {
|
||||
# no entry found
|
||||
if (defined $origip) {
|
||||
# try upgrading a default entry (probably from "add-addr-to-foo")
|
||||
my $noipaddr = $self->pack_addr ($addr, undef);
|
||||
my $noipent = $self->{checker}->get_addr_entry ($noipaddr, undef);
|
||||
|
||||
- if (defined $noipent->{msgcount} && $noipent->{msgcount} > 0) {
|
||||
+ if (defined $noipent->{count} && $noipent->{count} > 0) {
|
||||
dbg("auto-whitelist: found entry w/o IP address for $addr: replacing with $origip");
|
||||
$self->{checker}->remove_entry($noipent);
|
||||
# Now assign proper entry the count and totscore values of the
|
||||
# no-IP entry instead of assigning the whole value to avoid
|
||||
# wiping out any information added to the previous entry.
|
||||
- $entry->{msgcount} = $noipent->{msgcount};
|
||||
+ $entry->{count} = $noipent->{count};
|
||||
$entry->{totscore} = $noipent->{totscore};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- if ($entry->{msgcount} < 0 ||
|
||||
- $entry->{msgcount} != $entry->{msgcount} || # test for NaN
|
||||
+ if ($entry->{count} < 0 ||
|
||||
+ $entry->{count} != $entry->{count} || # test for NaN
|
||||
$entry->{totscore} != $entry->{totscore})
|
||||
{
|
||||
warn "auto-whitelist: resetting bad data for ($addr, $origip), ".
|
||||
- "count: $entry->{msgcount}, totscore: $entry->{totscore}\n";
|
||||
- $entry->{msgcount} = $entry->{totscore} = 0;
|
||||
+ "count: $entry->{count}, totscore: $entry->{totscore}\n";
|
||||
+ $entry->{count} = $entry->{totscore} = 0;
|
||||
}
|
||||
|
||||
- return !$entry->{msgcount} ? undef : $entry->{totscore} / $entry->{msgcount};
|
||||
+ return !$entry->{count} ? undef : $entry->{totscore} / $entry->{count};
|
||||
}
|
||||
|
||||
###########################################################################
|
||||
@@ -170,7 +170,7 @@ whitelist correction.
|
||||
|
||||
sub count {
|
||||
my $self = shift;
|
||||
- return $self->{entry}->{msgcount};
|
||||
+ return $self->{entry}->{count};
|
||||
}
|
||||
|
||||
|
||||
@@ -195,7 +195,7 @@ sub add_score {
|
||||
return; # don't try to add a NaN
|
||||
}
|
||||
|
||||
- $self->{entry}->{msgcount} ||= 0;
|
||||
+ $self->{entry}->{count} ||= 0;
|
||||
$self->{checker}->add_score($self->{entry}, $score);
|
||||
}
|
||||
|
||||
diff --git a/lib/Mail/SpamAssassin/DBBasedAddrList.pm b/lib/Mail/SpamAssassin/DBBasedAddrList.pm
|
||||
index 6aaed86..a1adca3 100644
|
||||
--- a/lib/Mail/SpamAssassin/DBBasedAddrList.pm
|
||||
+++ b/lib/Mail/SpamAssassin/DBBasedAddrList.pm
|
||||
@@ -125,10 +125,10 @@ sub get_addr_entry {
|
||||
addr => $addr,
|
||||
};
|
||||
|
||||
- $entry->{msgcount} = $self->{accum}->{$addr} || 0;
|
||||
+ $entry->{count} = $self->{accum}->{$addr} || 0;
|
||||
$entry->{totscore} = $self->{accum}->{$addr.'|totscore'} || 0;
|
||||
|
||||
- dbg("auto-whitelist: db-based $addr scores ".$entry->{msgcount}.'/'.$entry->{totscore});
|
||||
+ dbg("auto-whitelist: db-based $addr scores ".$entry->{count}.'/'.$entry->{totscore});
|
||||
return $entry;
|
||||
}
|
||||
|
||||
@@ -137,15 +137,15 @@ sub get_addr_entry {
|
||||
sub add_score {
|
||||
my($self, $entry, $score) = @_;
|
||||
|
||||
- $entry->{msgcount} ||= 0;
|
||||
+ $entry->{count} ||= 0;
|
||||
$entry->{addr} ||= '';
|
||||
|
||||
- $entry->{msgcount}++;
|
||||
+ $entry->{count}++;
|
||||
$entry->{totscore} += $score;
|
||||
|
||||
- dbg("auto-whitelist: add_score: new count: ".$entry->{msgcount}.", new totscore: ".$entry->{totscore});
|
||||
+ dbg("auto-whitelist: add_score: new count: ".$entry->{count}.", new totscore: ".$entry->{totscore});
|
||||
|
||||
- $self->{accum}->{$entry->{addr}} = $entry->{msgcount};
|
||||
+ $self->{accum}->{$entry->{addr}} = $entry->{count};
|
||||
$self->{accum}->{$entry->{addr}.'|totscore'} = $entry->{totscore};
|
||||
return $entry;
|
||||
}
|
||||
diff --git a/lib/Mail/SpamAssassin/Plugin/TxRep.pm b/lib/Mail/SpamAssassin/Plugin/TxRep.pm
|
||||
index 2ef3ddc..08b432b 100644
|
||||
--- a/lib/Mail/SpamAssassin/Plugin/TxRep.pm
|
||||
+++ b/lib/Mail/SpamAssassin/Plugin/TxRep.pm
|
||||
@@ -1521,7 +1521,7 @@ sub check_reputation {
|
||||
#--------------------------------------------------------------------------
|
||||
|
||||
###########################################################################
|
||||
-sub count {my $self=shift; return (defined $self->{checker})? $self->{entry}->{msgcount} : undef;}
|
||||
+sub count {my $self=shift; return (defined $self->{checker})? $self->{entry}->{count} : undef;}
|
||||
sub total {my $self=shift; return (defined $self->{checker})? $self->{entry}->{totscore} : undef;}
|
||||
###########################################################################
|
||||
|
||||
@@ -1538,11 +1538,11 @@ sub get_sender {
|
||||
$self->{entry} = $entry;
|
||||
$origip = $origip || 'none';
|
||||
|
||||
- if ($entry->{msgcount}<0 || $entry->{msgcount}=~/^(nan|)$/ || $entry->{totscore}=~/^(nan|)$/) {
|
||||
- warn "TxRep: resetting bad data for ($addr, $origip), count: $entry->{msgcount}, totscore: $entry->{totscore}\n";
|
||||
- $self->{entry}->{msgcount} = $self->{entry}->{totscore} = 0;
|
||||
+ if ($entry->{count}<0 || $entry->{count}=~/^(nan|)$/ || $entry->{totscore}=~/^(nan|)$/) {
|
||||
+ warn "TxRep: resetting bad data for ($addr, $origip), count: $entry->{count}, totscore: $entry->{totscore}\n";
|
||||
+ $self->{entry}->{count} = $self->{entry}->{totscore} = 0;
|
||||
}
|
||||
- return $self->{entry}->{msgcount};
|
||||
+ return $self->{entry}->{count};
|
||||
}
|
||||
|
||||
|
||||
@@ -1557,7 +1557,7 @@ sub add_score {
|
||||
warn "TxRep: attempt to add a $score to TxRep entry ignored\n";
|
||||
return; # don't try to add a NaN
|
||||
}
|
||||
- $self->{entry}->{msgcount} ||= 0;
|
||||
+ $self->{entry}->{count} ||= 0;
|
||||
|
||||
# performing the dilution aging correction
|
||||
if (defined $self->total() && defined $self->count() && defined $self->{txrep_dilution_factor}) {
|
||||
@@ -1587,9 +1587,9 @@ sub remove_score {
|
||||
}
|
||||
# no reversal dilution aging correction (not easily possible),
|
||||
# just removing the original message score
|
||||
- if ($self->{entry}->{msgcount} > 2)
|
||||
- {$self->{entry}->{msgcount} -= 2;}
|
||||
- else {$self->{entry}->{msgcount} = 0;}
|
||||
+ if ($self->{entry}->{count} > 2)
|
||||
+ {$self->{entry}->{count} -= 2;}
|
||||
+ else {$self->{entry}->{count} = 0;}
|
||||
# subtract 2, and add a score; hence decrementing by 1
|
||||
$self->{checker}->add_score($self->{entry}, -1*$score);
|
||||
}
|
||||
diff --git a/lib/Mail/SpamAssassin/SQLBasedAddrList.pm b/lib/Mail/SpamAssassin/SQLBasedAddrList.pm
|
||||
index 278f792..f3f40b4 100644
|
||||
--- a/lib/Mail/SpamAssassin/SQLBasedAddrList.pm
|
||||
+++ b/lib/Mail/SpamAssassin/SQLBasedAddrList.pm
|
||||
@@ -45,7 +45,7 @@ CREATE TABLE awl (
|
||||
username varchar(100) NOT NULL default '',
|
||||
email varchar(255) NOT NULL default '',
|
||||
ip varchar(40) NOT NULL default '',
|
||||
- msgcount int(11) NOT NULL default '0',
|
||||
+ count int(11) NOT NULL default '0',
|
||||
totscore float NOT NULL default '0',
|
||||
signedby varchar(255) NOT NULL default '',
|
||||
PRIMARY KEY (username,email,signedby,ip)
|
||||
@@ -191,7 +191,7 @@ sub get_addr_entry {
|
||||
|
||||
my $entry = { addr => $addr,
|
||||
exists_p => 0,
|
||||
- msgcount => 0,
|
||||
+ count => 0,
|
||||
totscore => 0,
|
||||
signedby => $signedby,
|
||||
};
|
||||
@@ -200,7 +200,7 @@ sub get_addr_entry {
|
||||
|
||||
return $entry unless $email ne '' && (defined $ip || defined $signedby);
|
||||
|
||||
- my $sql = "SELECT msgcount, totscore FROM $self->{tablename} " .
|
||||
+ my $sql = "SELECT count, totscore FROM $self->{tablename} " .
|
||||
"WHERE username = ? AND email = ?";
|
||||
my @args = ( $email );
|
||||
if (!$self->{_with_awl_signer}) {
|
||||
@@ -225,7 +225,7 @@ sub get_addr_entry {
|
||||
if (!$rc) { # there was an error, but try to go on
|
||||
info("auto-whitelist: sql-based get_addr_entry %s: SQL error: %s",
|
||||
join('|',@args), $sth->errstr);
|
||||
- $entry->{msgcount} = 0;
|
||||
+ $entry->{count} = 0;
|
||||
$entry->{totscore} = 0;
|
||||
}
|
||||
else {
|
||||
@@ -234,8 +234,8 @@ sub get_addr_entry {
|
||||
# how to combine data if there are several entries (like signed by
|
||||
# an author domain and by a remailer)? for now just take an average
|
||||
while ( defined($aryref = $sth->fetchrow_arrayref()) ) {
|
||||
- if (defined $entry->{msgcount} && defined $aryref->[1]) {
|
||||
- $entry->{msgcount} = $aryref->[0];
|
||||
+ if (defined $entry->{count} && defined $aryref->[1]) {
|
||||
+ $entry->{count} = $aryref->[0];
|
||||
$entry->{totscore} = $aryref->[1];
|
||||
}
|
||||
$entry->{exists_p} = 1;
|
||||
@@ -247,8 +247,8 @@ sub get_addr_entry {
|
||||
}
|
||||
$sth->finish();
|
||||
|
||||
- dbg("auto-whitelist: sql-based %s scores %s, msgcount %s",
|
||||
- join('|',@args), $entry->{totscore}, $entry->{msgcount});
|
||||
+ dbg("auto-whitelist: sql-based %s scores %s, count %s",
|
||||
+ join('|',@args), $entry->{totscore}, $entry->{count});
|
||||
|
||||
return $entry;
|
||||
}
|
||||
@@ -275,7 +275,7 @@ sub add_score {
|
||||
|
||||
my ($email, $ip) = $self->_unpack_addr($entry->{addr});
|
||||
|
||||
- $entry->{msgcount} += 1;
|
||||
+ $entry->{count} += 1;
|
||||
$entry->{totscore} += $score;
|
||||
my $signedby = $entry->{signedby};
|
||||
|
||||
@@ -286,7 +286,7 @@ sub add_score {
|
||||
|
||||
my $inserted = 0;
|
||||
|
||||
- { my @fields = qw(username email ip msgcount totscore);
|
||||
+ { my @fields = qw(username email ip count totscore);
|
||||
my @signedby;
|
||||
if ($self->{_with_awl_signer}) {
|
||||
push(@fields, 'signedby');
|
||||
@@ -327,9 +327,9 @@ sub add_score {
|
||||
# insert failed, assume primary key constraint, so try the update
|
||||
|
||||
my $sql = "UPDATE $self->{tablename} ".
|
||||
- "SET msgcount = ?, totscore = totscore + ? ".
|
||||
+ "SET count = ?, totscore = totscore + ? ".
|
||||
"WHERE username = ? AND email = ?";
|
||||
- my(@args) = ($entry->{msgcount}, $score, $self->{_username}, $email);
|
||||
+ my(@args) = ($entry->{count}, $score, $self->{_username}, $email);
|
||||
if ($self->{_with_awl_signer}) {
|
||||
my @signedby = !defined $signedby ? () : split(' ', lc $signedby);
|
||||
if (!@signedby) {
|
||||
@@ -352,8 +352,8 @@ sub add_score {
|
||||
join('|',@args), $sth->errstr);
|
||||
} else {
|
||||
dbg("auto-whitelist: sql-based add_score/update ".
|
||||
- "new msgcount: %s, new totscore: %s for %s",
|
||||
- $entry->{msgcount}, $entry->{totscore}, join('|',@args));
|
||||
+ "new count: %s, new totscore: %s for %s",
|
||||
+ $entry->{count}, $entry->{totscore}, join('|',@args));
|
||||
$entry->{exists_p} = 1;
|
||||
}
|
||||
}
|
||||
diff --git a/sql/README.awl b/sql/README.awl
|
||||
index 68de4a1..a1ddf40 100644
|
||||
--- a/sql/README.awl
|
||||
+++ b/sql/README.awl
|
||||
@@ -75,7 +75,7 @@ setting: "awl") with at least these fields:
|
||||
username varchar(100) # this is the username whose e-mail is being filtered
|
||||
email varchar(200) # this is the address key
|
||||
ip varchar(40) # this is the ip key (fits IPv4 or IPv6)
|
||||
- msgcount int(11) # this is the message counter
|
||||
+ count int(11) # this is the message counter
|
||||
totscore float # this is the total calculated score
|
||||
signedby varchar(255) # a DKIM or DomainKeys signing domain(s)
|
||||
|
||||
@@ -109,7 +109,7 @@ CREATE TABLE awl (
|
||||
username varchar(100) NOT NULL default '',
|
||||
email varchar(255) NOT NULL default '',
|
||||
ip varchar(40) NOT NULL default '',
|
||||
- msgcount int(11) NOT NULL default '0',
|
||||
+ count int(11) NOT NULL default '0',
|
||||
totscore float NOT NULL default '0',
|
||||
signedby varchar(255) NOT NULL default '',
|
||||
PRIMARY KEY (username,email,signedby,ip)
|
||||
diff --git a/sql/awl_mysql.sql b/sql/awl_mysql.sql
|
||||
index a8b6926..0bfa99a 100644
|
||||
--- a/sql/awl_mysql.sql
|
||||
+++ b/sql/awl_mysql.sql
|
||||
@@ -2,7 +2,7 @@ CREATE TABLE awl (
|
||||
username varchar(100) NOT NULL default '',
|
||||
email varbinary(255) NOT NULL default '',
|
||||
ip varchar(40) NOT NULL default '',
|
||||
- msgcount int(11) NOT NULL default '0',
|
||||
+ count int(11) NOT NULL default '0',
|
||||
totscore float NOT NULL default '0',
|
||||
signedby varchar(255) NOT NULL default '',
|
||||
last_hit timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
diff --git a/sql/awl_pg.sql b/sql/awl_pg.sql
|
||||
index 2cb3f3e..4f59d72 100644
|
||||
--- a/sql/awl_pg.sql
|
||||
+++ b/sql/awl_pg.sql
|
||||
@@ -2,7 +2,7 @@ CREATE TABLE awl (
|
||||
username varchar(100) NOT NULL default '',
|
||||
email varchar(255) NOT NULL default '',
|
||||
ip varchar(40) NOT NULL default '',
|
||||
- msgcount bigint NOT NULL default '0',
|
||||
+ count bigint NOT NULL default '0',
|
||||
totscore float NOT NULL default '0',
|
||||
signedby varchar(255) NOT NULL default '',
|
||||
last_hit timestamp NOT NULL default CURRENT_TIMESTAMP,
|
||||
diff --git a/sql/txrep_mysql.sql b/sql/txrep_mysql.sql
|
||||
index 9a4888b..bbe6b95 100644
|
||||
--- a/sql/txrep_mysql.sql
|
||||
+++ b/sql/txrep_mysql.sql
|
||||
@@ -2,7 +2,7 @@ CREATE TABLE txrep (
|
||||
username varchar(100) NOT NULL default '',
|
||||
email varchar(255) NOT NULL default '',
|
||||
ip varchar(40) NOT NULL default '',
|
||||
- msgcount int(11) NOT NULL default '0',
|
||||
+ count int(11) NOT NULL default '0',
|
||||
totscore float NOT NULL default '0',
|
||||
signedby varchar(255) NOT NULL default '',
|
||||
last_hit timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
diff --git a/sql/txrep_pg.sql b/sql/txrep_pg.sql
|
||||
index 191074c..463006b 100644
|
||||
--- a/sql/txrep_pg.sql
|
||||
+++ b/sql/txrep_pg.sql
|
||||
@@ -2,7 +2,7 @@ CREATE TABLE txrep (
|
||||
username varchar(100) NOT NULL default '',
|
||||
email varchar(255) NOT NULL default '',
|
||||
ip varchar(40) NOT NULL default '',
|
||||
- msgcount bigint NOT NULL default '0',
|
||||
+ count bigint NOT NULL default '0',
|
||||
totscore float NOT NULL default '0',
|
||||
signedby varchar(255) NOT NULL default '',
|
||||
last_hit timestamp NOT NULL default CURRENT_TIMESTAMP,
|
||||
diff --git a/UPGRADE b/UPGRADE
|
||||
index cfd31ab..b555b0b 100644
|
||||
--- a/UPGRADE
|
||||
+++ b/UPGRADE
|
||||
@@ -24,18 +24,6 @@ Note for Users Upgrading to SpamAssassin 3.4.3
|
||||
This is to make sure all the legacy installations and wiki guides etc
|
||||
still using it needlessly get fixed.
|
||||
|
||||
-- TxRep and Awl plugins has been modified to be compatible
|
||||
- with latest Postgresql versions.
|
||||
- You should upgrade your sql database running the following command:
|
||||
- MySQL:
|
||||
- "ALTER TABLE `txrep` CHANGE `count` `msgcount` INT(11) NOT NULL DEFAULT '0';"
|
||||
- "ALTER TABLE `awl` CHANGE `count` `msgcount` INT(11) NOT NULL DEFAULT '0';"
|
||||
- "ALTER TABLE `awl` ADD last_hit timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;"
|
||||
- PostgreSQL:
|
||||
- "ALTER TABLE txrep RENAME COLUMN count TO msgcount;"
|
||||
- "ALTER TABLE awl RENAME COLUMN count TO msgcount;"
|
||||
- "ALTER TABLE awl ADD last_hit timestamp NOT NULL default CURRENT_TIMESTAMP;"
|
||||
-
|
||||
- body_part_scan_size 50000, rawbody_part_scan_size 500000 defaults added (Bug 6582)
|
||||
These enable safer and faster scanning of large emails.
|
||||
|
||||
Loading…
Reference in new issue