From: bradleydoherty59 <bradleydoherty59@gmail.com>
Date: Tue, 23 Nov 2021 22:22:19 +0000 (-0600)
Subject: [Minor] Store Envelope (SMTP) information on structured task as task.envelope.
X-Git-Tag: 3.2~233^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=192ccf6a9f12ad2d1ff530300aebe61595ff5dd6;p=thirdparty%2Frspamd.git

[Minor] Store Envelope (SMTP) information on structured task as task.envelope.
---

diff --git a/lualib/lua_mime.lua b/lualib/lua_mime.lua
index 24c02daaec..308400c93c 100644
--- a/lualib/lua_mime.lua
+++ b/lualib/lua_mime.lua
@@ -582,6 +582,19 @@ exports.message_to_ucl = function(task)
   result.digest = task:get_digest()
   result.newlines = task:get_newlines_type()
   result.headers = task:get_headers(true) or {}
+  
+  -- Envelope (smtp) information form email
+  local envelope = {}
+  -- Want to differentiate the Mime and SMTP from/recipients here
+  envelope.from_smtp = task:get_from('smtp')
+  envelope.from_mime = task:get_from('mime')
+  envelope.recipients_smtp = task:get_recipients('smtp')
+  envelope.recipients_mime = task:get_recipients('mime')
+  
+  envelope.helo = task:get_helo()
+  envelope.hostname = task:get_hostname()
+  envelope.client_ip = task:get_client_ip()
+  result.envelope = envelope
 
   local parts = task:get_parts() or {}
   result.parts = {}