From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 9 Apr 2019 11:42:37 +0000 (+0100)
Subject: [Feature] Lua_maps: Allow static regexp and glob maps
X-Git-Tag: 1.9.2~48
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a6223eecc74c5ecbe48ff3265bb4c9b62c0c3dd7;p=rspamd.git

[Feature] Lua_maps: Allow static regexp and glob maps
---

diff --git a/lualib/lua_maps.lua b/lualib/lua_maps.lua
index c8cffa3c8..a21a60f4f 100644
--- a/lualib/lua_maps.lua
+++ b/lualib/lua_maps.lua
@@ -95,16 +95,32 @@ local function rspamd_map_add_from_ucl(opt, mtype, description)
           end
         end
       elseif mtype == 'regexp' or mtype == 'glob' then
-        -- Plain table
-        local map = rspamd_config:add_map{
-          type = mtype,
-          description = description,
-          url = opt,
-        }
-        if map then
-          ret.__data = map
-          setmetatable(ret, ret_mt)
-          return ret
+        if string.find(opt[1], '^/%a') or string.find(opt[1], '^http') then
+          -- Plain table
+          local map = rspamd_config:add_map{
+            type = mtype,
+            description = description,
+            url = opt,
+          }
+          if map then
+            ret.__data = map
+            setmetatable(ret, ret_mt)
+            return ret
+          end
+        else
+          local map = rspamd_config:add_map{
+            type = mtype,
+            description = description,
+            url = {
+              url = 'static',
+              data = opt,
+            }
+          }
+          if map then
+            ret.__data = map
+            setmetatable(ret, ret_mt)
+            return ret
+          end
         end
       else
         if string.find(opt[1], '^/%a') or string.find(opt[1], '^http') then