X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fmisc_spam;h=ffcd57e7e1fadacff056a908cc67b6669b4a5bc8;hp=68b6e76c4ddb53d5d18f035f3bdb94ae24165ee3;hb=1f5091a1b187eede97605fbe9e7f4eb597a50d28;hpb=bb54c2f84a356e635678c83114b846cf8ffc262e

diff --git a/common/misc_spam b/common/misc_spam
index 68b6e76..ffcd57e 100644
--- a/common/misc_spam
+++ b/common/misc_spam
@@ -27,21 +27,13 @@ describe PGPSIGNATURE	Has a pgp signature (may not be valid, but who cares?)
 score	 PGPSIGNATURE	-5
 
 
-# TODO: The rules below seem to be very similar; possibly fix them.
+body WORD_WITHOUT_VOWELS  /\b[bcdfghjklmnpqrstvwxz]{6,20}\b/
+describe WORD_WITHOUT_VOWELS Long word without any vowels
+score WORD_WITHOUT_VOWELS 1
 
-# These might trip up on non-english lists. We'll see.
-# They're fucking up on GPG signatures
-body MURPHY_WRONG_WORD1	/[bcdfghjklmnpqrstvwxz]{7,}/i
-score MURPHY_WRONG_WORD1 0.1
-
-body MURPHY_WRONG_WORD2 /[bcdfghjklmnpqrstvwxz]{6,}/i
-score MURPHY_WRONG_WORD2 0.2
-
-#Impronounceable. Need to check this one for accuracy (from airmax.cf)
-body IMPRONONCABLE_1                            /([bcdfghjklmnpqrstvwxz]){6,20}/
-describe IMPRONONCABLE_1                        Some words aren't easy to pronounce (too much vowels)
-body IMPRONONCABLE_2                            /(([abcdefghijklmnopqrstvwxyz]){1,9}\d{1,4}){2,9}/
-describe IMPRONONCABLE_2                        Some words aren't easy to pronounce (mixed numbers and lower-case letters)
+body DIGITS_LETTERS /(([abcdefghijklmnopqrstvwxyz]){1,9}\d{1,4}){2,9}/
+describe DIGITS_LETTERS Mixed groups of letters followed by numbers
+score DIGITS_LETTERS 1
 
 # From http://www.exit0.us/index.php/FredsRules
 # Added by pasc 2004/06/20
@@ -171,7 +163,7 @@ describe FAILNOTE	bounced spam
 score FAILNOTE		2
 
 # blarson 2007-06-28
-rawbody CTINLINE	/^Content\-Disposition\: inline\;\b/
+full CTINLINE	/^Content\-Disposition\: inline\;\b/
 describe CTINLINE	Inline attachment
 score CTINLINE		1
 
@@ -313,7 +305,7 @@ describe TINYFONT	tiny font specified
 score TINYFONT		3
 
 # blarson 2008-04-03
-rawbody ZIPFILE		/\bfilename\=.*\.zip\b/i
+full ZIPFILE		/\bfilename\=.*\.zip\b/i
 describe ZIPFILE	zipfile attachment
 score ZIPFILE		0.5
 
@@ -493,10 +485,30 @@ header CTOCTET_STREAM	Content-Type =~ /octet-stream/i
 describe CTOCTET_STREAM	Content type is octet-stream
 score CTOCTET_STREAM	0.5
 
-header RTF_ATTACH	Content-Type =~ /name=.+\.rtf/i
-describe RTF_ATTACH	Contains an RTF Attachment
-score RTF_ATTACH	0.5
+full RTF_ATTACH		/^Content-Disposition:.+name=.+\.(rtf|doc)/i
+describe RTF_ATTACH	Contains an RTF or DOC Attachment
+score RTF_ATTACH	2
 
 meta RTF_SPAM		CTOCTET_STREAM && RTF_ATTACH
 describe RTF_SPAM	Content type is octet-stream and has an RTF Attachment
 score RTF_SPAM		3
+
+# blarson 2010-10-11
+header WORDDIGDIG      subject =~ /^\w{3,}\s+\d\s\d\s*$/
+describe WORDDIGDIG    Word digit digit subject
+score WORDDIGDIG       3
+
+# don 2011-06-06
+header BRACE_SUBJECT	Subject =~ /^\[\ [a-z0-9]{16}]\ /
+describe BRACE_SUBJECT	16 length word in braces in the subject
+score BRACE_SUBJECT	4
+
+# formorer 2011-08-12
+header COMPTESFR    subject =~ /concernant Compte SFR/i
+describe COMPTESFR  concernant Compte SFR
+score COMPTESFR     3
+
+# formorer 2012-02-02
+header BACKTOME	    subject =~ /Please get back to me/i
+describe BACKTOME   Phrase get back to me
+score BACKTOME	    4