svn commit: r644752 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/VBounce.pm

[mm...@apache.org]

Author: mmartinec
Date: Fri Apr  4 09:13:28 2008
New Revision: 644752

URL: http://svn.apache.org/viewvc?rev=644752&view=rev
Log:
VBounce: ensure a known-false return value; match "Received:" only at the beginning of a line, case-insensitively and do not require a space after a colon

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/VBounce.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/VBounce.pm?rev=644752&r1=644751&r2=644752&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/VBounce.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/VBounce.pm Fri Apr  4 09:13:28 2008
@@ -106,7 +106,7 @@
 
   # check the plain-text body, first
   foreach my $line (@{$body}) {
-    next unless ($line =~ /Received: /);
+    next unless ($line =~ /^Received:/i);
     while ($line =~ / (\S+\.\S+) /g) {
       return 1 if $self->_relay_is_in_whitelist_bounce_relays($pms, $1);
     }
@@ -118,7 +118,7 @@
 
   my $pristine = $pms->{msg}->get_pristine_body();
   foreach my $line ($pristine =~ /^(.*)$/gm) {
-    next unless $line && ($line =~ /Received: /);
+    next unless $line && ($line =~ /^Received:/i);
     while ($line =~ / (\S+\.\S+) /g) {
       return 1 if $self->_relay_is_in_whitelist_bounce_relays($pms, $1);
     }
@@ -132,6 +132,8 @@
   return 1 if $self->_relay_is_in_list(
         $pms->{conf}->{whitelist_bounce_relays}, $pms, $relay);
   dbg("rules: relay $relay doesn't match any whitelist");
+
+  return 0;
 }
 
 sub _relay_is_in_list {