Re: Is RCVD_NUMERIC_HELO meant to match helo=2xx.2.2xx.62.fix.example.com ?

[Mark Martinec]

Per Jessen,
> Per Jessen wrote:
> > I was just wondering -
> >
> > RCVD_NUMERIC_HELO will match "helo=2xx4.2.2xx.62.fix.example.com" -
> > but is that intentional?  It's not exactly a numeric helo?
>
> That should have read "helo=2xx.2.2xx.62.fix.example.com".

Bug 5878
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=5878

Try the following patch:

Index: lib/Mail/SpamAssassin/Plugin/RelayEval.pm
===================================================================
--- lib/Mail/SpamAssassin/Plugin/RelayEval.pm   (revision 803926)
+++ lib/Mail/SpamAssassin/Plugin/RelayEval.pm   (working copy)
@@ -87,7 +87,9 @@
   if ($rcvd) {
     my $IP_ADDRESS = IPV4_ADDRESS;
     my $IP_PRIVATE = IP_PRIVATE;
-    if ($rcvd =~ /helo=($IP_ADDRESS)\b/i && $1 !~ /$IP_PRIVATE/) {
+    local $1;
+    if ($rcvd =~ /\bhelo=($IP_ADDRESS)(?=[\000-\040,;\[()<>]|\z)/i  # Bug 5878
+        && $1 !~ /$IP_PRIVATE/) {
       return 1;
     }
   }


Mark