You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2005/04/19 22:47:21 UTC
svn commit: r161970 - spamassassin/trunk/rules/60_whitelist.cf
spamassassin/trunk/rules/60_whitelist_spf.cf
Author: quinlan
Date: Tue Apr 19 13:47:21 2005
New Revision: 161970
URL: http://svn.apache.org/viewcvs?view=rev&rev=161970
Log:
SPF whitelist rules needed ifplugin, also move them to separate file
Added:
spamassassin/trunk/rules/60_whitelist_spf.cf
Modified:
spamassassin/trunk/rules/60_whitelist.cf
Modified: spamassassin/trunk/rules/60_whitelist.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/60_whitelist.cf?view=diff&r1=161969&r2=161970
==============================================================================
--- spamassassin/trunk/rules/60_whitelist.cf (original)
+++ spamassassin/trunk/rules/60_whitelist.cf Tue Apr 19 13:47:21 2005
@@ -40,19 +40,6 @@
describe USER_IN_DEF_WHITELIST From: address is in the default white-list
tflags USER_IN_DEF_WHITELIST userconf nice noautolearn
-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
-
-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
-
-header __ENV_AND_HDR_FROM_MATCH eval:check_for_matching_env_and_hdr_from()
-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
-
header USER_IN_BLACKLIST_TO eval:check_to_in_blacklist()
describe USER_IN_BLACKLIST_TO User is listed in 'blacklist_to'
tflags USER_IN_BLACKLIST_TO userconf noautolearn
@@ -80,49 +67,6 @@
#
# Please do not add unmoderated public mailing lists here. They are
# too easily abused by spammers.
-
-# we need the SPF plugin to do SPF validated whitelists, so:
-ifplugin Mail::SpamAssassin::Plugin::SPF
-
-def_whitelist_from_spf *@nytimes.com
-def_whitelist_from_spf *@amazon.com
-def_whitelist_from_spf *@*.amazon.com
-def_whitelist_from_spf *@amazon.co.uk
-def_whitelist_from_spf *@*.amazon.co.uk
-def_whitelist_from_spf *@ora.com
-def_whitelist_from_spf *@*.ora.com
-def_whitelist_from_spf *@bn.com
-def_whitelist_from_spf *@mypoints.com
-def_whitelist_from_spf *@*.mypoints.com
-def_whitelist_from_spf *@paypal.com
-def_whitelist_from_spf *@ebay.com
-def_whitelist_from_spf *@foolsubs.com
-def_whitelist_from_spf *@match.com
-
-# bugtraq: can contain malicious Javascript etc.
-def_whitelist_from_spf *@securityfocus.com
-
-def_whitelist_from_spf *@mediaunspun.imakenews.net
-
-# sender of Cringley newsletter
-def_whitelist_from_spf *@bdcimail.com
-
-# Silicon.com newslettters - we see thousands of these
-def_whitelist_from_spf *@silicon.com
-
-# C|Net news.com newsletters
-def_whitelist_from_spf *@newsletter.online.com
-
-# bug 1348
-def_whitelist_from_spf *@enews.buy.com
-def_whitelist_from_spf *@palm.m0.net
-def_whitelist_from_spf *@handspring.4at1.com
-
-endif # Mail::SpamAssassin::Plugin::SPF
-
-
-# the remaining default whitelists use the received headers and do not require
-# the SPF plugin
def_whitelist_from_rcvd billing@networksolutions.com networksolutions.com
def_whitelist_from_rcvd outbound-response@networksolutions.com networksolutions.com
Added: spamassassin/trunk/rules/60_whitelist_spf.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/60_whitelist_spf.cf?view=auto&rev=161970
==============================================================================
--- spamassassin/trunk/rules/60_whitelist_spf.cf (added)
+++ spamassassin/trunk/rules/60_whitelist_spf.cf Tue Apr 19 13:47:21 2005
@@ -0,0 +1,87 @@
+# SpamAssassin rules file: default SPF whitelists
+#
+# Please don't modify this file as your changes will be overwritten with
+# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
+# See 'perldoc Mail::SpamAssassin::Conf' for details.
+#
+# <@LICENSE>
+# Copyright 2004 Apache Software Foundation
+#
+# Licensed 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>
+
+###########################################################################
+# SPF whitelist rules
+
+ifplugin Mail::SpamAssassin::Plugin::SPF
+
+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
+
+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
+
+header __ENV_AND_HDR_FROM_MATCH eval:check_for_matching_env_and_hdr_from()
+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
+
+###########################################################################
+# Default whitelists. These should be addresses which send mail that is often
+# tagged (incorrectly) as spam; it also helps that they be addresses of big
+# companies with lots of lawyers, so if spammers impersonate them, they'll get
+# into big trouble, so it doesn't provide a shortcut around SpamAssassin.
+#
+# Whitelist and blacklist addresses are now file-glob-style patterns, so
+# "friend@somewhere.com", "*@isp.com", or "*.domain.net" will all work.
+#
+# Please do not add unmoderated public mailing lists here. They are
+# too easily abused by spammers.
+
+def_whitelist_from_spf *@nytimes.com
+def_whitelist_from_spf *@amazon.com
+def_whitelist_from_spf *@*.amazon.com
+def_whitelist_from_spf *@amazon.co.uk
+def_whitelist_from_spf *@*.amazon.co.uk
+def_whitelist_from_spf *@ora.com
+def_whitelist_from_spf *@*.ora.com
+def_whitelist_from_spf *@bn.com
+def_whitelist_from_spf *@mypoints.com
+def_whitelist_from_spf *@*.mypoints.com
+def_whitelist_from_spf *@paypal.com
+def_whitelist_from_spf *@ebay.com
+def_whitelist_from_spf *@foolsubs.com
+def_whitelist_from_spf *@match.com
+
+# bugtraq: can contain malicious Javascript etc.
+def_whitelist_from_spf *@securityfocus.com
+
+def_whitelist_from_spf *@mediaunspun.imakenews.net
+
+# sender of Cringley newsletter
+def_whitelist_from_spf *@bdcimail.com
+
+# Silicon.com newslettters - we see thousands of these
+def_whitelist_from_spf *@silicon.com
+
+# C|Net news.com newsletters
+def_whitelist_from_spf *@newsletter.online.com
+
+# bug 1348
+def_whitelist_from_spf *@enews.buy.com
+def_whitelist_from_spf *@palm.m0.net
+def_whitelist_from_spf *@handspring.4at1.com
+
+endif # Mail::SpamAssassin::Plugin::SPF