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 2021/02/02 17:29:02 UTC
svn commit: r1886130 -
/spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
Author: jhardin
Date: Tue Feb 2 17:29:02 2021
New Revision: 1886130
URL: http://svn.apache.org/viewvc?rev=1886130&view=rev
Log:
Tweak DDG and Google redir rules
Modified:
spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
Modified: spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf?rev=1886130&r1=1886129&r2=1886130&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Tue Feb 2 17:29:02 2021
@@ -2331,14 +2331,16 @@ score GOOG_MALWARE_DNLD
tflags GOOG_MALWARE_DNLD publish
uri __GOOG_REDIR m;^https?://[^/]*\.google\.com/url\?;i
-uri __GOOG_REDIR_IMG m;^https?://www\.google\.com/url\?.*q=https?://.*\.(?:png|gif|jpe?g)$;i
-uri __GOOG_REDIR_HTML m;^https?://www\.google\.com/url\?.*q=https?://.*\.html?$;i
-uri __GOOG_REDIR_ARCHV m;^https?://www\.google\.com/url\?.*q=https?://.*\.(?:ace|zip|7z|rar)$;i
+uri __GOOG_REDIR_IMG m;^https?://[^/]*\.google\.com/url\?(?:[^&]+\&)*q=https?://.*\.(?:png|gif|jpe?g)(?=$|\?|\&);i
+tflags __GOOG_REDIR_IMG multiple
+uri __GOOG_REDIR_HTML m;^https?://[^/]*\.google\.com/url\?(?:[^&]+\&)*q=https?://.*\.html?(?=$|\?|\&);i
+uri __GOOG_REDIR_ARCHV m;^https?://[^/]*\.google\.com/url\?(?:[^&]+\&)*q=https?://.*\.(?:ace|zip|7z|rar)(?=$|\?|\&);i
-uri __DDG_REDIR m;^https?://proxy\.duckduckgo\.com/iu/\?.*u=https?://;i
-uri __DDG_REDIR_IMG m;^https?://proxy\.duckduckgo\.com/iu/\?.*u=https?://.*\.(?:png|gif|jpe?g)$;i
-uri __DDG_REDIR_HTML m;^https?://proxy\.duckduckgo\.com/iu/\?.*u=https?://.*\.html?$;i
-uri __DDG_REDIR_ARCHV m;^https?://proxy\.duckduckgo\.com/iu/\?.*u=https?://.*\.(?:ace|zip|7z|rar)$;i
+uri __DDG_REDIR m;^https?://(?:proxy|external-content)\.duckduckgo\.com/iu/\?(?:[^&]+\&)*u=https?://;i
+uri __DDG_REDIR_IMG m;^https?://(?:proxy|external-content)\.duckduckgo\.com/iu/\?(?:[^&]+\&)*u=https?://.*\.(?:png|gif|jpe?g)(?=$|\?|\&);i
+tflags __DDG_REDIR_IMG multiple
+uri __DDG_REDIR_HTML m;^https?://(?:proxy|external-content)\.duckduckgo\.com/iu/\?(?:[^&]+\&)*u=https?://.*\.html?(?=$|\?|\&);i
+uri __DDG_REDIR_ARCHV m;^https?://(?:proxy|external-content)\.duckduckgo\.com/iu/\?(?:[^&]+\&)*u=https?://.*\.(?:ace|zip|7z|rar)(?=$|\?|\&);i
body ONLINE_MKTG_CNSLT /\bonline marketing consultant\b/i