From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 24 May 2017 11:11:57 +0000 (+0100)
Subject: [Fix] Use dkim signing callback properly
X-Git-Tag: 1.6.0~142
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=450d9a55450167db09f61139ee8086756839391d;p=rspamd.git

[Fix] Use dkim signing callback properly
---

diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c
index b73500ba8..099d67d99 100644
--- a/src/plugins/dkim_check.c
+++ b/src/plugins/dkim_check.c
@@ -590,7 +590,7 @@ lua_dkim_sign_handler (lua_State *L)
 	 * - key
 	 */
 	if (!rspamd_lua_parse_table_arguments (L, 2, &err,
-			"key=S;rawkey=V;*domain=S;*selector=S;no_check=B;headers=S",
+			"key=S;rawkey=V;*domain=S;*selector=S;no_cache=B;headers=S",
 			&key, &rawlen, &rawkey, &domain, &selector, &no_cache, &headers)) {
 		msg_err_task ("invalid return value from sign condition: %e",
 				err);
diff --git a/src/plugins/lua/dkim_signing.lua b/src/plugins/lua/dkim_signing.lua
index b76a73acb..7cd152ba3 100644
--- a/src/plugins/lua/dkim_signing.lua
+++ b/src/plugins/lua/dkim_signing.lua
@@ -45,6 +45,7 @@ local settings = {
 local E = {}
 local N = 'dkim_signing'
 local redis_params
+local sign_func = rspamd_plugins.dkim.sign
 
 local function simple_template(tmpl, keys)
   local lpeg = require "lpeg"
@@ -195,7 +196,8 @@ local function dkim_signing_cb(task)
             rk, err)
         else
           p.rawkey = data
-          if rspamd_plugins.dkim.sign(task, p) then
+          local ret, _ = sign_func(task, p)
+          if ret then
             task:insert_result(settings.symbol, 1.0)
           end
         end
@@ -242,7 +244,8 @@ local function dkim_signing_cb(task)
   else
     if (p.key and p.selector) then
       p.key = simple_template(p.key, {domain = p.domain, selector = p.selector})
-      return rspamd_plugins.dkim.sign(task, p)
+      local ret, _ = sign_func(task, p)
+      return ret
     else
       rspamd_logger.infox(task, 'key path or dkim selector unconfigured; no signing')
       return false