From 55e518faed32cdada115866a2514abbafdd70a83 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sun, 23 Sep 2018 17:24:19 +0100
Subject: [PATCH] [Minor] Fix dkim signing from HTTP headers

---
 lualib/lua_dkim_tools.lua        | 6 +++---
 src/plugins/lua/arc.lua          | 8 ++++++--
 src/plugins/lua/dkim_signing.lua | 7 ++++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/lualib/lua_dkim_tools.lua b/lualib/lua_dkim_tools.lua
index 5ea3f68bf..7b0852d49 100644
--- a/lualib/lua_dkim_tools.lua
+++ b/lualib/lua_dkim_tools.lua
@@ -56,9 +56,9 @@ local function parse_dkim_http_headers(N, task, settings)
     end
 
     return true,{
-      rawkey = key,
-      domain = domain,
-      selector = selector
+      rawkey = tostring(key),
+      domain = tostring(domain),
+      selector = tostring(selector)
     }
   end
 
diff --git a/src/plugins/lua/arc.lua b/src/plugins/lua/arc.lua
index 53fb7466a..9d3f79675 100644
--- a/src/plugins/lua/arc.lua
+++ b/src/plugins/lua/arc.lua
@@ -589,8 +589,12 @@ for k,v in pairs(opts) do
     settings[k] = v
   end
 end
-if not (settings.use_redis or settings.path or
-    settings.domain or settings.path_map or settings.selector_map) then
+if not (settings.use_redis or
+    settings.path or
+    settings.domain or
+    settings.path_map or
+    settings.selector_map or
+    settings.use_http_headers) then
   rspamd_logger.infox(rspamd_config, 'mandatory parameters missing, disable arc signing')
   lua_util.disable_module(N, "fail")
   return
diff --git a/src/plugins/lua/dkim_signing.lua b/src/plugins/lua/dkim_signing.lua
index f2d527a70..0913b14a3 100644
--- a/src/plugins/lua/dkim_signing.lua
+++ b/src/plugins/lua/dkim_signing.lua
@@ -193,7 +193,12 @@ for k,v in pairs(opts) do
     settings[k] = v
   end
 end
-if not (settings.use_redis or settings.path or settings.domain or settings.path_map or settings.selector_map) then
+if not (settings.use_redis or
+    settings.path or
+    settings.domain or
+    settings.path_map or
+    settings.selector_map or
+    settings.use_http_headers) then
   rspamd_logger.infox(rspamd_config, 'mandatory parameters missing, disable dkim signing')
   lua_util.disable_module(N, "config")
   return
-- 
2.39.5