From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sun, 16 Apr 2017 13:46:43 +0000 (+0100)
Subject: [Fix] Ignore Rmilter added Received
X-Git-Tag: 1.5.6~14
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f8e570d1c3f934c044bcd7a594a941d088ba525f;p=rspamd.git

[Fix] Ignore Rmilter added Received

Issue: #1587
---

diff --git a/rules/misc.lua b/rules/misc.lua
index 0d83fa02a..6e4366788 100644
--- a/rules/misc.lua
+++ b/rules/misc.lua
@@ -193,15 +193,21 @@ local check_rcvd = rspamd_config:register_symbol{
     local rcvds = task:get_received_headers()
     if not rcvds then return false end
 
-    local tls = fun.all(function(rc)
+    local all_tls = fun.all(function(rc)
       return rc.flags and rc.flags['ssl']
-    end, rcvds)
+    end, fun.filter(function(rc)
+      return rc.by and rc.by ~= 'localhost'
+    end, rcvds))
 
     -- See if only the last hop was encrypted
-    if tls then
+    if all_tls then
       task:insert_result('RCVD_TLS_ALL', 1.0)
     else
       local rcvd = rcvds[1]
+      if rcvd.by and rcvd.by == 'localhost' then
+        -- Ignore artificial header from Rmilter
+        rcvd = rcvds[2]
+      end
       if rcvd.flags and rcvd.flags['ssl'] then
         task:insert_result('RCVD_TLS_LAST', 1.0)
       else