svn commit: rev 6133 - in incubator/spamassassin/trunk: lib/Mail/SpamAssassin rules

[jm...@apache.org]

Author: jm
Date: Thu Jan  8 22:41:18 2004
New Revision: 6133

Modified:
   incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
   incubator/spamassassin/trunk/rules/70_cvs_rules_under_test.cf
Log:
added replacement for RCVD_NUMERIC_HELO using new Received parser; added 'tflags nice' for T_ALL_TRUSTED

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm	(original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm	Thu Jan  8 22:41:18 2004
@@ -1339,6 +1339,14 @@
 		$self->{msg}->get_header ('X-Original-Message-ID'), # bug 2122
 		$self->{msg}->get_header ('Message-Id'));
     }
+    # untrusted relays list, as string
+    elsif ($hdrname eq 'X-Spam-Relays-Untrusted') {
+      $_ = $self->{relays_untrusted_str};
+    }
+    # trusted relays list, as string
+    elsif ($hdrname eq 'X-Spam-Relays-Trusted') {
+      $_ = $self->{relays_trusted_str};
+    }
     # a conventional header
     else {
       my @hdrs = $self->{msg}->get_header ($hdrname);

Modified: incubator/spamassassin/trunk/rules/70_cvs_rules_under_test.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/70_cvs_rules_under_test.cf	(original)
+++ incubator/spamassassin/trunk/rules/70_cvs_rules_under_test.cf	Thu Jan  8 22:41:18 2004
@@ -312,6 +312,7 @@
 
 header T_ALL_TRUSTED		eval:check_all_trusted()
 describe T_ALL_TRUSTED		Did not pass through any untrusted hosts
+tflags T_ALL_TRUSTED		nice
 
 # both aspects of same spammer tool
 header T_NETIP_RCVD		Received =~ /netIP with HTTP\;/
@@ -348,4 +349,9 @@
 # Spammers are now attempting to use tiny font sizes to hide hashbusters
 body T_HTML_FONT_TINY		eval:html_test('tiny_font')
 describe T_HTML_FONT_TINY	HTML has a tiny font
+
+# more portable replacement for RCVD_NUMERIC_HELO that doesn't rely on
+# Received headers using "helo=" prefix
+header T_RCVD_NUMERIC_HELO	X-Spam-Relays-Untrusted =~ / helo=\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} /
+describe T_RCVD_NUMERIC_HELO	Received: contains an IP address used for HELO