Mailing List Archive

svn commit: r1879684 - in /spamassassin/trunk: ./ backend/nitemc/ build/announcements/ lib/Mail/SpamAssassin/ lib/Mail/SpamAssassin/Plugin/ rules/ t/
Author: hege
Date: Thu Jul 9 07:37:19 2020
New Revision: 1879684

URL: http://svn.apache.org/viewvc?rev=1879684&view=rev
Log:
Revert Revision 1879456 (Bug 7826)

Removed:
spamassassin/trunk/rules/v400.pre
spamassassin/trunk/t/allowlist_to.t
Modified:
spamassassin/trunk/CREDITS
spamassassin/trunk/backend/nitemc/ (props changed)
spamassassin/trunk/build/announcements/3.3.0.txt (props changed)
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm
spamassassin/trunk/rules/50_scores.cf
spamassassin/trunk/rules/60_whitelist.cf
spamassassin/trunk/rules/v343.pre
spamassassin/trunk/t/whitelist_to.t

Modified: spamassassin/trunk/CREDITS
URL: http://svn.apache.org/viewvc/spamassassin/trunk/CREDITS?rev=1879684&r1=1879683&r2=1879684&view=diff
==============================================================================
--- spamassassin/trunk/CREDITS [UTF-8] (original)
+++ spamassassin/trunk/CREDITS [UTF-8] Thu Jul 9 07:37:19 2020
@@ -1,4 +1,4 @@
-Copyright (C) 2020 The Apache Software Foundation
+Copyright (C) 2019 The Apache Software Foundation

Project Management Committee (PMC):


Propchange: spamassassin/trunk/backend/nitemc/
('svn:mergeinfo' removed)

Propchange: spamassassin/trunk/build/announcements/3.3.0.txt
('svn:mergeinfo' removed)

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1879684&r1=1879683&r2=1879684&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Thu Jul 9 07:37:19 2020
@@ -544,21 +544,19 @@ e.g.
});


-=item allowlist_to user@example.com
-
-Previously whitelist_to which will work interchangeably until 4.1.
+=item whitelist_to user@example.com

If the given address appears as a recipient in the message headers
(Resent-To, To, Cc, obvious envelope recipient, etc.) the mail will
-be listed as allowed. Useful if you're deploying SpamAssassin system-wide,
+be whitelisted. Useful if you're deploying SpamAssassin system-wide,
and don't want some users to have their mail filtered. Same format
as C<whitelist_from>.

-There are three levels of To-allowlisting, C<allowlist_to>, C<more_spam_to>
+There are three levels of To-whitelisting, C<whitelist_to>, C<more_spam_to>
and C<all_spam_to>. Users in the first level may still get some spammish
mails blocked, but users in C<all_spam_to> should never get mail blocked.

-The headers checked for allowlist addresses are as follows: if C<Resent-To> or
+The headers checked for whitelist addresses are as follows: if C<Resent-To> or
C<Resent-Cc> are set, use those; otherwise check all addresses taken from the
following set of headers:

@@ -586,9 +584,8 @@ See above.
=cut

push (@cmds, {
- setting => 'allowlist_to',
+ setting => 'whitelist_to',
type => $CONF_TYPE_ADDRLIST,
- aliases => ['whitelist_to'], # backward compatible - to be removed for 4.1
});
push (@cmds, {
setting => 'more_spam_to',
@@ -797,8 +794,8 @@ directive blacklist_to
Enlisting an address to the list named blacklist_from is synonymous to using the
directive blacklist_from

-Enlisting an address to the list named allowlist_to is synonymous to using the
-directive allowlist_to
+Enlisting an address to the list named whitelist_to is synonymous to using the
+directive whitelist_to

Enlisting an address to the list named whitelist_from is synonymous to using the
directive whitelist_from
@@ -4814,7 +4811,7 @@ sub new {
$self->{def_whitelist_from_rcvd} = { };

$self->{blacklist_to} = { };
- $self->{allowlist_to} = { };
+ $self->{whitelist_to} = { };
$self->{more_spam_to} = { };
$self->{all_spam_to} = { };


Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm?rev=1879684&r1=1879683&r2=1879684&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm Thu Jul 9 07:37:19 2020
@@ -42,7 +42,7 @@ sub new {
# the important bit!
$self->register_eval_rule("check_from_in_blacklist", $Mail::SpamAssassin::Conf::TYPE_HEAD_EVALS);
$self->register_eval_rule("check_to_in_blacklist", $Mail::SpamAssassin::Conf::TYPE_HEAD_EVALS);
- $self->register_eval_rule("check_to_in_allowlist", $Mail::SpamAssassin::Conf::TYPE_HEAD_EVALS);
+ $self->register_eval_rule("check_to_in_whitelist", $Mail::SpamAssassin::Conf::TYPE_HEAD_EVALS);
$self->register_eval_rule("check_to_in_more_spam", $Mail::SpamAssassin::Conf::TYPE_HEAD_EVALS);
$self->register_eval_rule("check_to_in_all_spam", $Mail::SpamAssassin::Conf::TYPE_HEAD_EVALS);
$self->register_eval_rule("check_from_in_list", $Mail::SpamAssassin::Conf::TYPE_HEAD_EVALS);
@@ -80,10 +80,10 @@ sub check_to_in_blacklist {
}
}

-sub check_to_in_allowlist {
+sub check_to_in_whitelist {
my ($self, $pms) = @_;
foreach ($pms->all_to_addrs()) {
- if ($self->_check_allowlist ($self->{main}->{conf}->{allowlist_to}, $_)) {
+ if ($self->_check_whitelist ($self->{main}->{conf}->{whitelist_to}, $_)) {
return 1;
}
}
@@ -403,13 +403,13 @@ sub _check_whitelist_rcvd {

###########################################################################

-sub _check_allowlist {
+sub _check_whitelist {
my ($self, $list, $addr) = @_;
$addr = lc $addr;
if (defined ($list->{$addr})) { return 1; }
foreach my $regexp (values %{$list}) {
if ($addr =~ $regexp) {
- dbg("rules: address $addr matches allowlist or blocklist regexp: $regexp");
+ dbg("rules: address $addr matches whitelist or blacklist regexp: $regexp");
return 1;
}
}

Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1879684&r1=1879683&r2=1879684&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Thu Jul 9 07:37:19 2020
@@ -711,12 +711,7 @@ score HEADER_HOST_IN_BLACKLIST 100.0
score HEADER_HOST_IN_WHITELIST -100.0

# not really false positives but the user wants spam!
-if (version >= 4.000000)
- #Version 4.0.0 renames whitelist to allowlist
- score USER_IN_ALLOWLIST_TO -6.000
-else
- score USER_IN_WHITELIST_TO -6.000
-endif
+score USER_IN_WHITELIST_TO -6.000
score USER_IN_MORE_SPAM_TO -20.000
score USER_IN_ALL_SPAM_TO -100.000
endif

Modified: spamassassin/trunk/rules/60_whitelist.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/60_whitelist.cf?rev=1879684&r1=1879683&r2=1879684&view=diff
==============================================================================
--- spamassassin/trunk/rules/60_whitelist.cf (original)
+++ spamassassin/trunk/rules/60_whitelist.cf Thu Jul 9 07:37:19 2020
@@ -47,16 +47,9 @@ header USER_IN_BLACKLIST_TO eval:che
describe USER_IN_BLACKLIST_TO User is listed in 'blacklist_to'
tflags USER_IN_BLACKLIST_TO userconf noautolearn

-if (version >= 4.000000)
- #Version 4.0.0 renames whitelist to allowlist
- header USER_IN_ALLOWLIST_TO eval:check_to_in_allowlist()
- describe USER_IN_ALLOWLIST_TO User is listed in 'allowlist_to'
- tflags USER_IN_ALLOWLIST_TO userconf nice noautolearn
-else
- header USER_IN_WHITELIST_TO eval:check_to_in_whitelist()
- describe USER_IN_WHITELIST_TO User is listed in 'whitelist_to'
- tflags USER_IN_WHITELIST_TO userconf nice noautolearn
-endif
+header USER_IN_WHITELIST_TO eval:check_to_in_whitelist()
+describe USER_IN_WHITELIST_TO User is listed in 'whitelist_to'
+tflags USER_IN_WHITELIST_TO userconf nice noautolearn

header USER_IN_MORE_SPAM_TO eval:check_to_in_more_spam()
describe USER_IN_MORE_SPAM_TO User is listed in 'more_spam_to'
@@ -67,24 +60,24 @@ describe USER_IN_ALL_SPAM_TO User is
tflags USER_IN_ALL_SPAM_TO userconf nice noautolearn

if (version >= 3.004000)
- body URI_HOST_IN_BLACKLIST eval:check_uri_host_in_blacklist()
- describe URI_HOST_IN_BLACKLIST Host or Domain is listed in the user's URI black-list
- tflags URI_HOST_IN_BLACKLIST userconf noautolearn
-
- body URI_HOST_IN_WHITELIST eval:check_uri_host_in_whitelist()
- describe URI_HOST_IN_WHITELIST Host or Domain is listed in the user's URI white-list
- tflags URI_HOST_IN_WHITELIST userconf nice noautolearn
-
- # Bug 7256, using a header rule with an eval() function does not work the way
- # this was intended.
-
- # header HEADER_HOST_IN_BLACKLIST eval:check_uri_host_listed('BLACK')
- # describe HEADER_HOST_IN_BLACKLIST Host or Domain in header is listed in the user's URI black-list
- # tflags HEADER_HOST_IN_BLACKLIST userconf noautolearn
-
- # header HEADER_HOST_IN_WHITELIST eval:check_uri_host_listed('WHITE')
- # describe HEADER_HOST_IN_WHITELIST Host or Domain in header is listed in the user's URI white-list
- # tflags HEADER_HOST_IN_WHITELIST userconf nice noautolearn
+body URI_HOST_IN_BLACKLIST eval:check_uri_host_in_blacklist()
+describe URI_HOST_IN_BLACKLIST Host or Domain is listed in the user's URI black-list
+tflags URI_HOST_IN_BLACKLIST userconf noautolearn
+
+body URI_HOST_IN_WHITELIST eval:check_uri_host_in_whitelist()
+describe URI_HOST_IN_WHITELIST Host or Domain is listed in the user's URI white-list
+tflags URI_HOST_IN_WHITELIST userconf nice noautolearn
+
+# Bug 7256, using a header rule with an eval() function does not work the way
+# this was intended.
+
+# header HEADER_HOST_IN_BLACKLIST eval:check_uri_host_listed('BLACK')
+# describe HEADER_HOST_IN_BLACKLIST Host or Domain in header is listed in the user's URI black-list
+# tflags HEADER_HOST_IN_BLACKLIST userconf noautolearn
+
+# header HEADER_HOST_IN_WHITELIST eval:check_uri_host_listed('WHITE')
+# describe HEADER_HOST_IN_WHITELIST Host or Domain in header is listed in the user's URI white-list
+# tflags HEADER_HOST_IN_WHITELIST userconf nice noautolearn
endif

###########################################################################

Modified: spamassassin/trunk/rules/v343.pre
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/v343.pre?rev=1879684&r1=1879683&r2=1879684&view=diff
==============================================================================
--- spamassassin/trunk/rules/v343.pre (original)
+++ spamassassin/trunk/rules/v343.pre Thu Jul 9 07:37:19 2020
@@ -3,7 +3,7 @@
# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be
# tweaked.
#
-# This file was installed during the installation of SpamAssassin 3.4.3,
+# This file was installed during the installation of SpamAssassin 4.0.0,
# and contains plugin loading commands for the new plugins added in that
# release. It will not be overwritten during future SpamAssassin installs,
# so you can modify it to enable some disabled-by-default plugins below,

Modified: spamassassin/trunk/t/whitelist_to.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/whitelist_to.t?rev=1879684&r1=1879683&r2=1879684&view=diff
==============================================================================
--- spamassassin/trunk/t/whitelist_to.t (original)
+++ spamassassin/trunk/t/whitelist_to.t Thu Jul 9 07:37:19 2020
@@ -8,7 +8,7 @@ use Test::More tests => 1;

%patterns = (

- q{ USER_IN_ALLOWLIST_TO }, 'hit-al',
+ q{ USER_IN_WHITELIST_TO }, 'hit-wl',

);

@@ -17,5 +17,5 @@ tstprefs ("
whitelist_to announce*
");

-sarun ("-L -t -D < data/nice/016", \&patterns_run_cb);
+sarun ("-L -t < data/nice/016", \&patterns_run_cb);
ok_all_patterns();