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

Merge pull request #8300 from thalesmg/fix-missing-acl-placeholder-42 

fix(acl): do not leave placeholders unreplaced (4.2)
This commit is contained in:
Thales Macedo Garitezi 2022-06-23 09:54:09 -03:00 committed by GitHub
parent e72014ed00 af284cebf7
commit d30c88fab8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/emqx.appup.src
View File

@ -172,6 +172,7 @@
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
]},
{<<"4.2.8">>, [
{load_module, emqx_access_rule, brutal_purge, soft_purge, []},
{load_module, emqx_alarm, brutal_purge, soft_purge, []},
{load_module, emqx_banned, brutal_purge, soft_purge, []},
{load_module, emqx_message, brutal_purge, soft_purge, []},
@ -189,6 +190,7 @@
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
]},
{<<"4.2.9">>, [
{load_module, emqx_access_rule, brutal_purge, soft_purge, []},
{load_module, emqx_alarm, brutal_purge, soft_purge, []},
{load_module, emqx_banned, brutal_purge, soft_purge, []},
{load_module, emqx_message, brutal_purge, soft_purge, []},
@ -205,6 +207,7 @@
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
]},
{<<"4.2.10">>, [
{load_module, emqx_access_rule, brutal_purge, soft_purge, []},
{load_module, emqx_alarm, brutal_purge, soft_purge, []},
{load_module, emqx_banned, brutal_purge, soft_purge, []},
{load_module, emqx_message, brutal_purge, soft_purge, []},
@ -219,6 +222,7 @@
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
]},
{<<"4.2.11">>, [
{load_module, emqx_access_rule, brutal_purge, soft_purge, []},
{load_module, emqx_alarm, brutal_purge, soft_purge, []},
{load_module, emqx_banned, brutal_purge, soft_purge, []}
]},
@ -384,6 +388,7 @@
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
]},
{<<"4.2.8">>, [
{load_module, emqx_access_rule, brutal_purge, soft_purge, []},
{load_module, emqx_message, brutal_purge, soft_purge, []},
{load_module, emqx_frame, brutal_purge, soft_purge, []},
{load_module, emqx_channel, brutal_purge, soft_purge, []},
@ -399,6 +404,7 @@
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
]},
{<<"4.2.9">>, [
{load_module, emqx_access_rule, brutal_purge, soft_purge, []},
{load_module, emqx_message, brutal_purge, soft_purge, []},
{load_module, emqx_frame, brutal_purge, soft_purge, []},
{load_module, emqx_channel, brutal_purge, soft_purge, []},
@ -413,6 +419,7 @@
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
]},
{<<"4.2.10">>, [
{load_module, emqx_access_rule, brutal_purge, soft_purge, []},
{load_module, emqx_message, brutal_purge, soft_purge, []},
{load_module, emqx_channel, brutal_purge, soft_purge, []},
{load_module, emqx_frame, brutal_purge, soft_purge, []},

19
src/emqx_access_rule.erl
View File

@ -133,9 +133,13 @@ match_who(_ClientInfo, _Who) ->
match_topics(_ClientInfo, _Topic, []) ->
false;
match_topics(ClientInfo, Topic, [{pattern, PatternFilter}|Filters]) ->
TopicFilter = feed_var(ClientInfo, PatternFilter),
match_topic(emqx_topic:words(Topic), TopicFilter)
orelse match_topics(ClientInfo, Topic, Filters);
case feed_var(ClientInfo, PatternFilter) of
nomatch ->
false;
TopicFilter ->
match_topic(emqx_topic:words(Topic), TopicFilter)
orelse match_topics(ClientInfo, Topic, Filters)
end;
match_topics(ClientInfo, Topic, [TopicFilter|Filters]) ->
match_topic(emqx_topic:words(Topic), TopicFilter)
orelse match_topics(ClientInfo, Topic, Filters).
@ -149,14 +153,13 @@ feed_var(ClientInfo, Pattern) ->
feed_var(ClientInfo, Pattern, []).
feed_var(_ClientInfo, [], Acc) ->
lists:reverse(Acc);
feed_var(ClientInfo = #{clientid := undefined}, [<<"%c">>|Words], Acc) ->
feed_var(ClientInfo, Words, [<<"%c">>|Acc]);
feed_var(#{clientid := undefined}, [<<"%c">>|_Words], _Acc) ->
nomatch;
feed_var(ClientInfo = #{clientid := ClientId}, [<<"%c">>|Words], Acc) ->
feed_var(ClientInfo, Words, [ClientId |Acc]);
feed_var(ClientInfo = #{username := undefined}, [<<"%u">>|Words], Acc) ->
feed_var(ClientInfo, Words, [<<"%u">>|Acc]);
feed_var(#{username := undefined}, [<<"%u">>|_Words], _Acc) ->
nomatch;
feed_var(ClientInfo = #{username := Username}, [<<"%u">>|Words], Acc) ->
feed_var(ClientInfo, Words, [Username|Acc]);
feed_var(ClientInfo, [W|Words], Acc) ->
feed_var(ClientInfo, Words, [W|Acc]).