From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 1 Jun 2017 14:24:07 +0000 (+0100)
Subject: [Minor] Add smtp auth results to Authentication-Results
X-Git-Tag: 1.6.0~85
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9d72040612f37dbabad845459eb61fd75eaae233;p=rspamd.git

[Minor] Add smtp auth results to Authentication-Results
---

diff --git a/lualib/auth_results.lua b/lualib/auth_results.lua
index c5fffb8e2..e706291c4 100644
--- a/lualib/auth_results.lua
+++ b/lualib/auth_results.lua
@@ -164,6 +164,22 @@ local function gen_auth_results(task, settings)
     end
   end
 
+  local u = task:get_user()
+  local smtp_from = task:get_from('smtp')
+
+  if u and smtp_from then
+    local hdr
+
+    if #smtp_from[1]['addr'] > 0 then
+      hdr = string.format('auth=pass smtp.auth=%s smtp.mailfrom=%s',
+        u, smtp_from[1]['addr'])
+    else
+      hdr = string.format('auth=pass smtp.auth=%s', u)
+    end
+
+    table.insert(hdr_parts, hdr)
+  end
+
   if #hdr_parts > 0 then
     return table.concat(hdr_parts, '; ')
   end