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

fix(mgmt): fix substring matching alg

This commit is contained in:
JianBo He 2022-01-05 10:45:51 +08:00
parent 6b02d93b73
commit 9cf03bb18a
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
apps/emqx_management/src/emqx_mgmt_api_clients.erl
View File

@ -333,31 +333,24 @@ query({Qs, Fuzzy}, Start, Limit) ->
match_fun(Ms, Fuzzy) -> match_fun(Ms, Fuzzy) ->
MsC = ets:match_spec_compile(Ms), MsC = ets:match_spec_compile(Ms),
REFuzzy = lists:map(fun({K, like, S}) ->
{ok, RE} = re:compile(escape(S)),
{K, like, RE}
end, Fuzzy),
fun(Rows) -> fun(Rows) ->
case ets:match_spec_run(Rows, MsC) of case ets:match_spec_run(Rows, MsC) of
[] -> []; [] -> [];
Ls -> Ls ->
lists:filter(fun(E) -> lists:filter(fun(E) ->
run_fuzzy_match(E, REFuzzy) run_fuzzy_match(E, Fuzzy)
end, Ls) end, Ls)
end end
end. end.
escape(B) when is_binary(B) ->
re:replace(B, <<"\\\\">>, <<"\\\\\\\\">>, [{return, binary}, global]).
run_fuzzy_match(_, []) -> run_fuzzy_match(_, []) ->
true; true;
run_fuzzy_match(E = {_, #{clientinfo := ClientInfo}, _}, [{Key, _, RE}|Fuzzy]) -> run_fuzzy_match(E = {_, #{clientinfo := ClientInfo}, _}, [{Key, like, SubStr}|Fuzzy]) ->
Val = case maps:get(Key, ClientInfo, "") of Val = case maps:get(Key, ClientInfo, undefined) of
undefined -> ""; undefined -> <<>>;
V -> V V -> V
end, end,
re:run(Val, RE, [{capture, none}]) == match andalso run_fuzzy_match(E, Fuzzy). binary:match(Val, SubStr) /= nomatch andalso run_fuzzy_match(E, Fuzzy).
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% QueryString to Match Spec %% QueryString to Match Spec
@ -453,9 +446,24 @@ params2qs_test() ->
[{{'$1', #{}, '_'}, [], ['$_']}] = qs2ms([]). [{{'$1', #{}, '_'}, [], ['$_']}] = qs2ms([]).
escape_test() -> fuzzy_match_test() ->
Str = <<"\\n">>, Info = {emqx_channel_info,
{ok, Re} = re:compile(escape(Str)), #{clientinfo =>
{match, _} = re:run(<<"\\name">>, Re). #{ clientid => <<"abcde">>
, username => <<"abc\\name*[]()">>
}}, []
},
true = run_fuzzy_match(Info, [{clientid, like, <<"abcde">>}]),
true = run_fuzzy_match(Info, [{clientid, like, <<"bcd">>}]),
false = run_fuzzy_match(Info, [{clientid, like, <<"defh">>}]),
true = run_fuzzy_match(Info, [{username, like, <<"\\name">>}]),
true = run_fuzzy_match(Info, [{username, like, <<"*">>}]),
true = run_fuzzy_match(Info, [{username, like, <<"[]">>}]),
true = run_fuzzy_match(Info, [{username, like, <<"()">>}]),
false = run_fuzzy_match(Info, [{username, like, <<"))">>}]),
true = run_fuzzy_match(Info, [{clientid, like, <<"de">>},
{username, like, <<"[]">>}]).
-endif. -endif.