From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 7 Aug 2015 15:28:43 +0000 (+0100)
Subject: Rework MISSING_SUBJECT rule.
X-Git-Tag: 1.0.0~219
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c82ed6c21402329d5c06d4e650b40a93eb9e63be;p=thirdparty%2Frspamd.git

Rework MISSING_SUBJECT rule.

Issue:	#343
Reported by:	@moisseev
---

diff --git a/rules/regexp/headers.lua b/rules/regexp/headers.lua
index f026d548bf..9255de792b 100644
--- a/rules/regexp/headers.lua
+++ b/rules/regexp/headers.lua
@@ -32,11 +32,16 @@ reconf['SUBJECT_NEEDS_ENCODING'] = string.format('!(%s) & !(%s) & (%s)', subject
 -- Detects that there is no space in From header (e.g. Some Name<some@host>)
 reconf['R_NO_SPACE_IN_FROM'] = 'From=/\\S<[-\\w\\.]+\\@[-\\w\\.]+>/X'
 
--- Detects missing subject
-local has_subject = 'header_exists(Subject)'
-local empty_subject = 'Subject=/^$/'
--- Final rule
-reconf['MISSING_SUBJECT'] = string.format('!(%s) | (%s)', has_subject, empty_subject)
+
+rspamd_config.MISSING_SUBJECT = function(task)
+  local hdr = task:get_header('Subject')
+  
+  if not hdr or #hdr == 0 then
+    return true
+  end
+  
+  return false
+end
 
 -- Detects bad content-transfer-encoding for text parts
 -- For text parts (text/plain and text/html mainly)