Browse Source

[Minor] Unify settings checks

tags/1.9.3
Vsevolod Stakhov 5 years ago
parent
commit
ba4c9baa69
3 changed files with 13 additions and 14 deletions
  1. 10
    0
      lualib/lua_dkim_tools.lua
  2. 1
    7
      src/plugins/lua/arc.lua
  3. 2
    7
      src/plugins/lua/dkim_signing.lua

+ 10
- 0
lualib/lua_dkim_tools.lua View File

@@ -521,4 +521,14 @@ exports.sign_using_redis = function(N, task, settings, selectors, sign_func, err
end
end

exports.validate_signing_settings = function(settings)
return settings.use_redis or
settings.path or
settings.domain or
settings.path_map or
settings.selector_map or
settings.use_http_headers or
(settings.signing_table and settings.key_table)
end

return exports

+ 1
- 7
src/plugins/lua/arc.lua View File

@@ -637,13 +637,7 @@ for k,v in pairs(opts) do
end
end

if not (settings.use_redis or
settings.path or
settings.domain or
settings.path_map or
settings.selector_map or
settings.use_http_headers or
(settings.signing_table and settings.key_table)) then
if not dkim_sign_tools.validate_signing_settings(settings) then
rspamd_logger.infox(rspamd_config, 'mandatory parameters missing, disable arc signing')
return
end

+ 2
- 7
src/plugins/lua/dkim_signing.lua View File

@@ -138,17 +138,12 @@ for k,v in pairs(opts) do
end
end

if not (settings.use_redis or
settings.path or
settings.domain or
settings.path_map or
settings.selector_map or
settings.use_http_headers or
(settings.signing_table and settings.key_table)) then
if not dkim_sign_tools.validate_signing_settings(settings) then
rspamd_logger.infox(rspamd_config, 'mandatory parameters missing, disable dkim signing')
lua_util.disable_module(N, "config")
return
end

if settings.use_redis then
redis_params = lua_redis.parse_redis_server('dkim_signing')


Loading…
Cancel
Save