You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by ax...@apache.org on 2014/10/29 00:18:33 UTC
svn commit: r1635005 - in /spamassassin/trunk/rules: 50_scores.cf
60_whitelist.cf
Author: axb
Date: Tue Oct 28 23:18:33 2014
New Revision: 1635005
URL: http://svn.apache.org/r1635005
Log:
added missing eval:check_uri_host_in_* rules
Modified:
spamassassin/trunk/rules/50_scores.cf
spamassassin/trunk/rules/60_whitelist.cf
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1635005&r1=1635004&r2=1635005&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Tue Oct 28 23:18:33 2014
@@ -704,7 +704,11 @@ ifplugin Mail::SpamAssassin::Plugin::WLB
score USER_IN_BLACKLIST 100.000
score USER_IN_WHITELIST -100.000
score USER_IN_DEF_WHITELIST -15.000
-score USER_IN_BLACKLIST_TO 10.000
+score USER_IN_BLACKLIST_TO 10.000
+score URI_HOST_IN_BLACKLIST 100.0
+score URI_HOST_IN_WHITELIST -100.0
+score HEADER_HOST_IN_BLACKLIST 100.0
+score HEADER_HOST_IN_WHITELIST -100.0
# not really false positives but the user wants spam!
score USER_IN_WHITELIST_TO -6.000
Modified: spamassassin/trunk/rules/60_whitelist.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/60_whitelist.cf?rev=1635005&r1=1635004&r2=1635005&view=diff
==============================================================================
--- spamassassin/trunk/rules/60_whitelist.cf (original)
+++ spamassassin/trunk/rules/60_whitelist.cf Tue Oct 28 23:18:33 2014
@@ -11,9 +11,9 @@
# 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.
@@ -59,6 +59,22 @@ header USER_IN_ALL_SPAM_TO eval:che
describe USER_IN_ALL_SPAM_TO User is listed in 'all_spam_to'
tflags USER_IN_ALL_SPAM_TO userconf nice noautolearn
+body URI_HOST_IN_BLACKLIST eval:check_uri_host_in_blacklist()
+describe URI_HOST_IN_BLACKLIST domain is in the URL's 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 domain is in the URL's white-list
+tflags URI_HOST_IN_WHITELIST userconf noautolearn
+
+header HEADER_HOST_IN_BLACKLIST eval:check_uri_host_listed('BLACK')
+describe HEADER_HOST_IN_BLACKLIST Blacklisted header host or domain
+tflags HEADER_HOST_IN_BLACKLIST userconf noautolearn
+
+header HEADER_HOST_IN_WHITELIST eval:check_uri_host_listed('WHITE')
+describe HEADER_HOST_IN_WHITELIST Whitelisted header host or domain
+tflags HEADER_HOST_IN_WHITELIST userconf noautolearn
+
###########################################################################
# 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