You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jh...@apache.org on 2018/07/04 16:16:22 UTC

svn commit: r1835063 - in /spamassassin/trunk/rules: 20_dynrdns.cf 20_fake_helo_tests.cf

Author: jhardin
Date: Wed Jul  4 16:16:22 2018
New Revision: 1835063

URL: http://svn.apache.org/viewvc?rev=1835063&view=rev
Log:
Add dynamic-RDNS/HELO exclusion for dynamic-looking static MTA hostnames from sendgrid.net

Modified:
    spamassassin/trunk/rules/20_dynrdns.cf
    spamassassin/trunk/rules/20_fake_helo_tests.cf

Modified: spamassassin/trunk/rules/20_dynrdns.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dynrdns.cf?rev=1835063&r1=1835062&r2=1835063&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_dynrdns.cf (original)
+++ spamassassin/trunk/rules/20_dynrdns.cf Wed Jul  4 16:16:22 2018
@@ -197,7 +197,8 @@ header __RDNS_DYNAMIC_ASAHI   X-Spam-Rel
 
 # exceptions (bug 5397):
 # exceptions: 66-220-155-151.mail-mail.facebook.com
-header  __RDNS_STATIC         X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*(?:fix|static|fixip|dedicated|mail\-mail)/i
+# exceptions: o167-89-97-77.outbound-mail.sendgrid.net (bug 7592)
+header  __RDNS_STATIC         X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*(?:fix|static|fixip|dedicated|mail\-mail|outbound-mail)/i
 
 # bug 5586:
 header __CGATE_RCVD       Received =~ /by \S+ \(CommuniGate Pro/

Modified: spamassassin/trunk/rules/20_fake_helo_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_fake_helo_tests.cf?rev=1835063&r1=1835062&r2=1835063&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_fake_helo_tests.cf (original)
+++ spamassassin/trunk/rules/20_fake_helo_tests.cf Wed Jul  4 16:16:22 2018
@@ -33,9 +33,12 @@ require_version @@VERSION@@
 # cmr-208-124-139-194.cr.net.cable.rogers.com) [208.124.139.194]
 # cmr-208-97-119-114.cr.net.cable.rogers.com) [208.97.119.114]
 header __HELO_STATIC_ROGERS X-Spam-Relays-External =~ /^[^\]]+ helo=cmr-\d{1,3}-\d{1,3}-\d{1,3}-\d{1,3}\S+\.rogers\.com[^\]]+ auth= /i
-describe HELO_STATIC_HOST Relay HELO'd using static hostname
-meta HELO_STATIC_HOST (__HELO_STATIC_ROGERS)
 
+# o167-89-97-77.outbound-mail.sendgrid.net (bug 7592)
+header __HELO_STATIC_SENDGRID X-Spam-Relays-External =~ /^[^\]]+ helo=o\d{1,3}-\d{1,3}-\d{1,3}-\d{1,3}\.outbound-mail\.sendgrid\.net\s[^\]]+ auth= /i
+
+describe HELO_STATIC_HOST Relay HELO'd using static hostname
+meta HELO_STATIC_HOST (__HELO_STATIC_ROGERS || __HELO_STATIC_SENDGRID)
 
 # ---------------------------------------------------------------------------