From 785481f6d52470adcbea18858ce66f01679ce622 Mon Sep 17 00:00:00 2001
From: Steve Freegard <steve@stevefreegard.com>
Date: Tue, 28 Mar 2017 23:46:35 +0100
Subject: [PATCH] Rules updates

---
 rules/headers_checks.lua | 20 ++++++++++++++++++++
 rules/misc.lua           | 11 +++++++++++
 rules/regexp/misc.lua    |  2 +-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/rules/headers_checks.lua b/rules/headers_checks.lua
index a4e202f5e6..1ff27ce2f9 100644
--- a/rules/headers_checks.lua
+++ b/rules/headers_checks.lua
@@ -881,3 +881,23 @@ rspamd_config:register_symbol{
   type = 'virtual',
   description = 'Some of the recipients match the envelope',
 }
+
+rspamd_config.CTYPE_MISSING_DISPOSITION = {
+  callback = function(task)
+    local parts = task:get_parts()
+    if (not parts) or (parts and #parts < 1) then return false end
+    for _,p in ipairs(parts) do
+      local ct = p:get_header('Content-Type')
+      if (ct and ct:lower():match('^application/octet%-stream') ~= nil) then
+        local cd = p:get_header('Content-Disposition')
+        if (not cd) or (cd and cd:lower():find('^attachment') == nil) then
+          return true
+        end
+      end
+    end
+    return false
+  end,
+  description = 'Binary content-type not specified as an attachment',
+  score = 4.0,
+  group = 'header'
+}
diff --git a/rules/misc.lua b/rules/misc.lua
index 07af50c125..0d83fa02ac 100644
--- a/rules/misc.lua
+++ b/rules/misc.lua
@@ -204,6 +204,8 @@ local check_rcvd = rspamd_config:register_symbol{
       local rcvd = rcvds[1]
       if rcvd.flags and rcvd.flags['ssl'] then
         task:insert_result('RCVD_TLS_LAST', 1.0)
+      else
+        task:insert_result('RCVD_NO_TLS_LAST', 1.0)
       end
     end
 
@@ -235,6 +237,15 @@ rspamd_config:register_symbol{
   group = 'encryption'
 }
 
+rspamd_config:register_symbol{
+  type = 'virtual',
+  parent = check_rcvd,
+  name = 'RCVD_NO_TLS_LAST',
+  description = 'Last hop did not use encrypted transports',
+  score = 0.0,
+  group = 'encryption'
+}
+
 rspamd_config:register_symbol{
   type = 'virtual',
   parent = check_rcvd,
diff --git a/rules/regexp/misc.lua b/rules/regexp/misc.lua
index 2da59ef7f1..1adfe98fdb 100644
--- a/rules/regexp/misc.lua
+++ b/rules/regexp/misc.lua
@@ -19,7 +19,7 @@ local reconf = config['regexp']
 
 reconf['HTML_META_REFRESH_URL'] = {
   -- Requires options { check_attachements = true; }
-  re = '/<meta\\s+http-equiv="refresh"\\s+content="\\d+;url=/{sa_raw_body}i',
+  re = '/<meta\\s+http-equiv="refresh"\\s+content="\\d+\\s*;\\s*url=/{sa_raw_body}i',
   description = "Has HTML Meta refresh URL",
   score = 5.0,
   group = 'HTML'
-- 
2.47.3