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

chore(jwt-acl): avoid the disruptions caused by rule formatting errors

This commit is contained in:
JianBo He 2022-10-21 11:39:17 +08:00
parent fa4203effa
commit 38e87579c0
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/emqx_auth_jwt/src/emqx_auth_jwt.erl
View File

@ -114,12 +114,15 @@ verify_acl(ClientInfo, Acl, PubSub, Topic) ->
subscribe -> <<"sub">>;
publish -> <<"pub">>
end,
case {maps:get(<<"all">>, Acl, []), maps:get(Key, Acl, [])} of
{Rules1, Rules2} when is_list(Rules1) andalso is_list(Rules2) ->
verify_acl(ClientInfo, Rules1 ++ Rules2, Topic);
{_, _} ->
{stop, deny}
end.
Rules0 = lists:foldl(
fun(K, Acc) ->
[case maps:get(K, Acl, undefined) of
R when is_list(R) -> R;
_ -> []
end | Acc]
end, [], [<<"all">>, Key]),
Rules = lists:concat(Rules0),
verify_acl(ClientInfo, Rules, Topic).
verify_acl(_ClientInfo, [], _Topic) -> {stop, deny};
verify_acl(ClientInfo, [AclTopic | AclTopics], Topic) ->