You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2005/05/03 05:34:06 UTC
svn commit: r167849 - in /spamassassin/trunk/rules: 20_compensate.cf
20_head_tests.cf 50_scores.cf 70_testing.cf
Author: jm
Date: Mon May 2 20:34:04 2005
New Revision: 167849
URL: http://svn.apache.org/viewcvs?rev=167849&view=rev
Log:
bug 4283: promote UNPARSEABLE_RELAY, NO_RELAYS, NO_RECEIVED as informational rules
Modified:
spamassassin/trunk/rules/20_compensate.cf
spamassassin/trunk/rules/20_head_tests.cf
spamassassin/trunk/rules/50_scores.cf
spamassassin/trunk/rules/70_testing.cf
Modified: spamassassin/trunk/rules/20_compensate.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/20_compensate.cf?rev=167849&r1=167848&r2=167849&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_compensate.cf (original)
+++ spamassassin/trunk/rules/20_compensate.cf Mon May 2 20:34:04 2005
@@ -27,6 +27,15 @@
# The message was never sent via an untrustworthy host.
header ALL_TRUSTED eval:check_all_trusted()
-describe ALL_TRUSTED Did not pass through any untrusted hosts
+describe ALL_TRUSTED Passed through trusted hosts only via SMTP
tflags ALL_TRUSTED nice
+
+header NO_RELAYS eval:check_no_relays()
+tflags NO_RELAYS nice userconf
+describe NO_RELAYS Informational: message was not relayed via SMTP
+
+header __HAS_RCVD exists:Received
+meta NO_RECEIVED (!__HAS_RCVD)
+tflags NO_RECEIVED nice userconf
+describe NO_RECEIVED Informational: message has no Received headers
Modified: spamassassin/trunk/rules/20_head_tests.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/20_head_tests.cf?rev=167849&r1=167848&r2=167849&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_head_tests.cf (original)
+++ spamassassin/trunk/rules/20_head_tests.cf Mon May 2 20:34:04 2005
@@ -35,6 +35,12 @@
header MISSING_HB_SEP eval:check_msg_parse_flags('missing_head_body_separator')
describe MISSING_HB_SEP Missing blank line between message header and body
+header UNPARSEABLE_RELAY eval:check_relays_unparseable()
+tflags UNPARSEABLE_RELAY userconf
+describe UNPARSEABLE_RELAY Informational: message has unparseable relay lines
+
+###########################################################################
+
header NO_REAL_NAME From =~ /^["\s]*\<?\S+\@\S+\>?\s*$/
describe NO_REAL_NAME From: does not include a real name
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/50_scores.cf?rev=167849&r1=167848&r2=167849&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Mon May 2 20:34:04 2005
@@ -567,6 +567,11 @@
# HTML control test
score HTML_MESSAGE 0.001
+# Informational rules about Received header parsing
+score NO_RELAYS -0.001
+score NO_RECEIVED -0.001
+score UNPARSEABLE_RELAY 0.001
+
# ok_locales
score CHARSET_FARAWAY 3.200
score CHARSET_FARAWAY_HEADER 3.200
Modified: spamassassin/trunk/rules/70_testing.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?rev=167849&r1=167848&r2=167849&view=diff
==============================================================================
--- spamassassin/trunk/rules/70_testing.cf (original)
+++ spamassassin/trunk/rules/70_testing.cf Mon May 2 20:34:04 2005
@@ -64,19 +64,6 @@
# 1.972 2.4562 0.2249 0.916 0.64 0.01 T_NORMAL_HTTP_TO_IP
body T_NORMAL_HTTP_TO_IP eval:check_numeric_http()
-########################################################################
-
-# remove evals if these aren't promoted
-header T_UNPARSEABLE_RELAY eval:check_relays_unparseable()
-
-header T_NO_RELAYS eval:check_no_relays()
-tflags T_NO_RELAYS nice
-
-header __NO_RCVD exists:Received
-meta T_NO_RCVD (!__NO_RCVD)
-
-########################################################################
-
# this doesn't hit a lot, but it's a definite obfuscation technique
uri T_HTTP_BAD_HOST_CHAR m@^https?://[^/]*[\000-\037\200-\377]@i