tweak the shipping id rules

[spamassassin_config.git] / common / virus_spam

diff --git a/common/virus_spam b/common/virus_spam
index 1129f2495e3fa57e9485d2e1f3e114dfae8699dc..ef94c43932875cc2378ed006cccfa96cc7c8f80f 100644 (file)
--- a/common/virus_spam
+++ b/common/virus_spam
@@ -100,14 +100,18 @@ describe FEDEXPACKAGE Fedex Package Virus spam
 score FEDEXPACKAGE 4
 
 #don 2016-11-04
-header SHIPPING_ID subject =~ /(ID:?|ID|\#|n\.)\s*\d{8,}\s*$/
-describe SHIPPING_ID Contains a long ID number at the end
+header SHIPPING_ID subject =~ /(ID:?|ID|\#|n\.)\s*\d{7,}\s*($|shipment|delivery)/
+describe SHIPPING_ID Contains a long ID number at the end or folled by shipment
 score SHIPPING_ID 3
 
+header SHIP_ID_INT subject =~ /(ID:?|ID|\#|n\.)\s*\d{7,}\s*/
+describe SHIP_ID_INT Contains a long ID number inside
+score SHIP_ID_INT 1
+
 rawbody MSWORD    /application\/msword/
 describe MSWORD   Has a word attachment
 score MSWORD      2
 
-meta FEDEX_ZIP (FEDEXPACKAGE || SHIPPING_ID ) && ( ZIPCOMPRESSED || ZIPFILE || MSWORD )
+meta FEDEX_ZIP (FEDEXPACKAGE || SHIPPING_ID || SHIP_ID_INT ) && ( ZIPCOMPRESSED || ZIPFILE || MSWORD )
 describe FEDEX_ZIP Fedex package with zip file
 score FEDEX_ZIP 6