Mailing List Archive

Author: jm
Date: Wed Jun 1 18:04:03 2005
New Revision: 179477

URL: http://svn.apache.org/viewcvs?rev=179477&view=rev
Log:
bug 3859: change SPF HELO check to match standard definition; check the exact hostname provided in the HELO command, instead of the domain part of that hostname only.

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm?rev=179477&r1=179476&r2=179477&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm Wed Jun 1 18:04:03 2005
@@ -207,7 +207,7 @@
return if $scanner->check_for_from_dns();

if ($ishelo) {
- # SPF HELO-checking variant. This isn't really SPF at all ;)
+ # SPF HELO-checking variant
$scanner->{spf_helo_checked} = 1;
$scanner->{spf_helo_pass} = 0;
$scanner->{spf_helo_neutral} = 0;
@@ -215,7 +215,7 @@
$scanner->{spf_helo_softfail} = 0;
$scanner->{spf_helo_failure_comment} = undef;
} else {
- # "real" SPF; checking the envelope-from (where we can)
+ # SPF on envelope sender (where possible)
$scanner->{spf_checked} = 1;
$scanner->{spf_pass} = 0;
$scanner->{spf_neutral} = 0;
@@ -236,13 +236,6 @@

if ($ishelo) {
dbg("spf: checking HELO (helo=$helo, ip=$ip)");
-
- if ($helo !~ /^\d+\.\d+\.\d+\.\d+$/) {
- # get rid of hostname part of domain, understanding delegation
- $helo = Mail::SpamAssassin::Util::RegistrarBoundaries::trim_domain ($helo);
- }
-
- dbg("spf: trimmed HELO down to '$helo'");

} else {
$self->_get_sender($scanner) unless $scanner->{sender_got};