Mailing List Archive

Author: dos
Date: Sat Dec 16 20:44:30 2006
New Revision: 487940

URL: http://svn.apache.org/viewvc?view=rev&rev=487940
Log:
bug 5239: we can run SPF checks in local_tests_only mode now, re-using Received-SPF header results

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
spamassassin/trunk/rules/25_spf.cf
spamassassin/trunk/rules/50_scores.cf
spamassassin/trunk/rules/60_whitelist_spf.cf

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm?view=diff&rev=487940&r1=487939&r2=487940
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm Sat Dec 16 20:44:30 2006
@@ -657,9 +657,6 @@
sub _check_spf_whitelist {
my ($self, $scanner) = @_;

- return unless $scanner->is_dns_available();
- return if ($self->{no_spf_module});
-
$scanner->{spf_whitelist_from_checked} = 1;
$scanner->{spf_whitelist_from} = 0;

@@ -704,9 +701,6 @@

sub _check_def_spf_whitelist {
my ($self, $scanner) = @_;
-
- return unless $scanner->is_dns_available();
- return if ($self->{no_spf_module});

$scanner->{def_spf_whitelist_from_checked} = 1;
$scanner->{def_spf_whitelist_from} = 0;

Modified: spamassassin/trunk/rules/25_spf.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_spf.cf?view=diff&rev=487940&r1=487939&r2=487940
==============================================================================
--- spamassassin/trunk/rules/25_spf.cf (original)
+++ spamassassin/trunk/rules/25_spf.cf Sat Dec 16 20:44:30 2006
@@ -57,14 +57,8 @@
describe SPF_HELO_FAIL SPF: HELO does not match SPF record (fail)
describe SPF_HELO_SOFTFAIL SPF: HELO does not match SPF record (softfail)

-tflags SPF_PASS net nice userconf
-tflags SPF_NEUTRAL net
-tflags SPF_FAIL net
-tflags SPF_SOFTFAIL net
-tflags SPF_HELO_PASS net nice userconf
-tflags SPF_HELO_NEUTRAL net
-tflags SPF_HELO_FAIL net
-tflags SPF_HELO_SOFTFAIL net
+tflags SPF_PASS nice userconf
+tflags SPF_HELO_PASS nice userconf

# rules from earlier than current release that can be reused
#reuse SPF_PASS

Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?view=diff&rev=487940&r1=487939&r2=487940
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Sat Dec 16 20:44:30 2006
@@ -607,12 +607,12 @@
score SPF_PASS -0.001
score SPF_HELO_PASS -0.001
# <gen:mutable>
-score SPF_FAIL 0 1.333 0 1.142
-score SPF_HELO_FAIL 0 0.001 0 0.001
-score SPF_HELO_NEUTRAL 0 0.001 0 0.001
-score SPF_HELO_SOFTFAIL 0 2.078 0 2.432
-score SPF_NEUTRAL 0 1.379 0 1.069
-score SPF_SOFTFAIL 0 1.470 0 1.384
+score SPF_FAIL 0.001 1.333 0.001 1.142
+score SPF_HELO_FAIL 0.001 0.001 0.001 0.001
+score SPF_HELO_NEUTRAL 0.001 0.001 0.001 0.001
+score SPF_HELO_SOFTFAIL 0.001 2.078 0.001 2.432
+score SPF_NEUTRAL 0.001 1.379 0.001 1.069
+score SPF_SOFTFAIL 0.001 1.470 0.001 1.384
# </gen:mutable>
endif # Mail::SpamAssassin::Plugin::SPF


Modified: spamassassin/trunk/rules/60_whitelist_spf.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/60_whitelist_spf.cf?view=diff&rev=487940&r1=487939&r2=487940
==============================================================================
--- spamassassin/trunk/rules/60_whitelist_spf.cf (original)
+++ spamassassin/trunk/rules/60_whitelist_spf.cf Sat Dec 16 20:44:30 2006
@@ -28,15 +28,15 @@

header USER_IN_SPF_WHITELIST eval:check_for_spf_whitelist_from()
describe USER_IN_SPF_WHITELIST From: address is in the user's SPF whitelist
-tflags USER_IN_SPF_WHITELIST userconf nice noautolearn net
+tflags USER_IN_SPF_WHITELIST userconf nice noautolearn

header USER_IN_DEF_SPF_WL eval:check_for_def_spf_whitelist_from()
describe USER_IN_DEF_SPF_WL From: address is in the default SPF white-list
-tflags USER_IN_DEF_SPF_WL userconf nice noautolearn net
+tflags USER_IN_DEF_SPF_WL userconf nice noautolearn

meta ENV_AND_HDR_SPF_MATCH (USER_IN_DEF_SPF_WL && __ENV_AND_HDR_FROM_MATCH)
describe ENV_AND_HDR_SPF_MATCH Env and Hdr From used in default SPF WL Match
-tflags ENV_AND_HDR_SPF_MATCH userconf nice noautolearn net
+tflags ENV_AND_HDR_SPF_MATCH userconf nice noautolearn

###########################################################################
# Default whitelists. These should be addresses which send mail that is often