yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6462 from JimMoen/fix-authz-pgsql 

fix(authz): placeholder regular expression escape
This commit is contained in:
JimMoen 2021-12-17 09:24:06 +08:00 committed by GitHub
parent 412771a890 477b62200d
commit e0fd6d553e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/emqx_authz/src/emqx_authz_postgresql.erl
View File

@ -57,13 +57,15 @@ parse_query(undefined) ->
undefined;
parse_query(Sql) ->
case re:run(Sql, ?RE_PLACEHOLDER, [global, {capture, all, list}]) of
{match, Variables} ->
Params = [Var || [Var] <- Variables],
Vars = ["$" ++ integer_to_list(I) || I <- lists:seq(1, length(Params))],
NSql = lists:foldl(fun({Param, Var}, S) ->
re:replace(S, Param, Var, [{return, list}])
end, Sql, lists:zip(Params, Vars)),
{NSql, Params};
{match, Capured} ->
PlaceHolders = [PlaceHolder || [PlaceHolder] <- Capured],
Replacements = ["$" ++ integer_to_list(I) || I <- lists:seq(1, length(PlaceHolders))],
NSql = lists:foldl(
fun({PlaceHolder, Replacement}, S) ->
re:replace(
S, emqx_authz:ph_to_re(PlaceHolder), Replacement, [{return, list}])
end, Sql, lists:zip(PlaceHolders, Replacements)),
{NSql, PlaceHolders};
nomatch ->
{Sql, []}
end.