From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 1 Dec 2020 14:43:38 +0000 (+0000)
Subject: [Minor] Fix --from argument
X-Git-Tag: 2.7~93
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee81bd5e37e63e566ff37a85df1f501043fc3203;p=thirdparty%2Frspamd.git

[Minor] Fix --from argument
---

diff --git a/lualib/rspamadm/dns_tool.lua b/lualib/rspamadm/dns_tool.lua
index f45f4a4a3c..91a726d092 100644
--- a/lualib/rspamadm/dns_tool.lua
+++ b/lualib/rspamadm/dns_tool.lua
@@ -98,7 +98,14 @@ local function spf_handler(opts)
   end
 
   if opts.from then
-    task:set_from('smtp', {addr = opts.from})
+    local rspamd_parsers = require "rspamd_parsers"
+    local addr_parsed = rspamd_parsers.parse_mail_address(opts.from)
+    if addr_parsed then
+      task:set_from('smtp', addr_parsed[1])
+    else
+      io.stderr:write('Invalid from addr\n')
+      os.exit(1)
+    end
   elseif opts.domain then
     task:set_from('smtp', {user = 'user', domain = opts.domain})
   else