diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-08-23 14:03:44 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-08-23 14:04:41 +0100 |
| commit | 6e8df5589dbd3246ae5c6c50a82a78ffb7ab3a75 (patch) | |
| tree | 134a79f86b4f65677f5c280638246eeca55cbd6c /lualib | |
| parent | 93d4fba9e2889fa05e1b526173fa2028e0dff571 (diff) | |
| download | rspamd-6e8df5589dbd3246ae5c6c50a82a78ffb7ab3a75.tar.gz rspamd-6e8df5589dbd3246ae5c6c50a82a78ffb7ab3a75.zip | |
[Minor] Lua_util: Rework and add tests for callback_from_string
Diffstat (limited to 'lualib')
| -rw-r--r-- | lualib/lua_dkim_tools.lua | 7 | ||||
| -rw-r--r-- | lualib/lua_util.lua | 36 |
2 files changed, 31 insertions, 12 deletions
diff --git a/lualib/lua_dkim_tools.lua b/lualib/lua_dkim_tools.lua index f61e38ae9..90bff13d5 100644 --- a/lualib/lua_dkim_tools.lua +++ b/lualib/lua_dkim_tools.lua @@ -699,7 +699,12 @@ exports.process_signing_settings = function(N, settings, opts) elseif k == 'vault_domains' then settings[k] = lua_maps.map_add(N, k, 'glob', 'DKIM signing domains in vault') elseif k == 'sign_condition' then - settings[k] = lua_util.callback_from_string(v) + local ret,f = lua_util.callback_from_string(v) + if ret then + settings[k] = f + else + logger.errx(rspamd_config, 'cannot load sign condition %s: %s', v, f) + end else settings[k] = v end diff --git a/lualib/lua_util.lua b/lualib/lua_util.lua index 4aa39db9b..6a43294c6 100644 --- a/lualib/lua_util.lua +++ b/lualib/lua_util.lua @@ -1071,23 +1071,37 @@ end ---[[[ -- @function lua_util.callback_from_string(str) --- Converts a string like `return function(...) end` to lua function or emits error using --- `rspamd_config` superglobal --- @return function object or nil +-- Converts a string like `return function(...) end` to lua function and return true and this function +-- or returns false + error message +-- @return status code and function object or an error message --]]] -exports.callback_from_string = function(str) +exports.callback_from_string = function(s) local loadstring = loadstring or load - local ret, res_or_err = pcall(loadstring(str)) - if not ret or type(res_or_err) ~= 'function' then - local rspamd_logger = require "rspamd_logger" - rspamd_logger.errx(rspamd_config, 'invalid callback (%s) - must be a function', - res_or_err) + if not s or #s == 0 then + return false,'invalid or empty string' + end - return nil + s = exports.rspamd_str_trim(s) + local inp + + if s:match('^return%s*function') then + -- 'return function', can be evaluated directly + inp = s + elseif s:match('^function%s*%(') then + inp = 'return ' .. s + else + -- Just a plain sequence + inp = 'return function(...)\n' .. s .. '; end' + end + + local ret, res_or_err = pcall(loadstring(inp)) + + if not ret or type(res_or_err) ~= 'function' then + return false,res_or_err end - return res_or_err + return ret,res_or_err end ---[[[ |