commit 8fe0974: Revert "[Fix] Selectors: Filter nil elements in lists"

Vsevolod Stakhov vsevolod at highsecure.ru
Thu Feb 25 12:42:06 UTC 2021


Author: Vsevolod Stakhov
Date: 2021-02-25 12:36:01 +0000
URL: https://github.com/rspamd/rspamd/commit/8fe0974de537d25bf60637c9ff2d6463eca660b4 (HEAD -> master)

Revert "[Fix] Selectors: Filter nil elements in lists"
This reverts commit 60396f2478b0f7284b42139d6d8e05bf81b12b20.

---
 lualib/lua_selectors/init.lua | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/lualib/lua_selectors/init.lua b/lualib/lua_selectors/init.lua
index 9a4af2e04..cc44d0b01 100644
--- a/lualib/lua_selectors/init.lua
+++ b/lualib/lua_selectors/init.lua
@@ -349,18 +349,13 @@ exports.parse_selector = function(cfg, str)
               ret = (inp[method_name](inp, unpack_function(args or E)))
             end
 
-            -- Do not go further
-            if not ret then return nil end
-
             local ret_type = type(ret)
             -- Now apply types heuristic
             if ret_type == 'string' then
               return ret,'string'
-            elseif ret_type == 'table' and ret[1] ~= nil then
-              local filt_predicate =  fun.filter(function(elt)
-                return elt ~= nil
-              end, ret)
-              return filt_predicate, 'string_list'
+            elseif ret_type == 'table' then
+              -- TODO: we need to ensure that 1) table is numeric 2) table has merely strings
+              return ret,'string_list'
             else
               return implicit_tostring(ret_type, ret)
             end


More information about the Commits mailing list