nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix. Escape strings in regex api (#2523)

Browse Source
This commit is contained in:
Alexey Melnichuk
2017-04-20 16:48:49 +03:00
committed by FusionPBX
parent 45e1aeac84
commit debfcbbc5b
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
resources/install/scripts/resources/functions/route_to_bridge.lua
View File

@@ -3,11 +3,18 @@ local log = require "resources.functions.log".route_to_bridge
local pcre_match local pcre_match
if freeswitch then if freeswitch then
--! @todo find better way to extract captures
api = api or freeswitch.API() api = api or freeswitch.API()
local function escape_regex(s)
s = string.gsub(s, '\\', '\\\\')
s = string.gsub(s, '|', '\\|')
return s
end
--! @todo find better way to extract captures
local unpack = unpack or table.unpack local unpack = unpack or table.unpack
function pcre_match(str, pat) function pcre_match(str, pat)
local a = str .. "|/" .. pat .."/" local a = escape_regex(str) .. "|/" .. escape_regex(pat) .."/"
if api:execute("regex", a) == 'false' then return end if api:execute("regex", a) == 'false' then return end
local t = {} local t = {}
for i = 1, 5 do for i = 1, 5 do
@@ -23,6 +30,7 @@ else
end end
local function pcre_self_test() local function pcre_self_test()
io.write('Test regex ')
local a, b, c local a, b, c
a,b,c = pcre_match('abcd', '(\\d{3})(\\d{3})') a,b,c = pcre_match('abcd', '(\\d{3})(\\d{3})')
assert(a == nil) assert(a == nil)
@@ -30,6 +38,14 @@ local function pcre_self_test()
a,b,c = pcre_match('123456', '(\\d{3})(\\d{3})') a,b,c = pcre_match('123456', '(\\d{3})(\\d{3})')
assert(a == '123', a) assert(a == '123', a)
assert(b == '456', b) assert(b == '456', b)
a,b,c = pcre_match('999', '(888|999)')
assert(a == '999', a)
a,b,c = pcre_match('888|999', '(888\\|999)')
assert(a == '888|999', a)
io.write(' - ok\n')
end end
local select_routes_sql = [[ local select_routes_sql = [[