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

fix: topic filter with qos/clientid/share

This commit is contained in:
zhongwencool 2022-04-20 16:53:50 +08:00
parent 4390c58ebb
commit 10bca7f6b5
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl
View File

@ -67,7 +67,8 @@ list(Bindings, Params) when map_size(Bindings) == 0 ->
Topic0 -> Topic0 ->
Topic = emqx_mgmt_util:urldecode(Topic0), Topic = emqx_mgmt_util:urldecode(Topic0),
Data = emqx_mgmt:list_subscriptions_via_topic(Topic, ?format_fun), Data = emqx_mgmt:list_subscriptions_via_topic(Topic, ?format_fun),
minirest:return({ok, add_meta(Params, Data)}) FilterData = filter_subscriptions(Data, Params),
minirest:return({ok, add_meta(Params, FilterData)})
end; end;
list(#{node := Node} = Bindings, Params) -> list(#{node := Node} = Bindings, Params) ->
@ -85,7 +86,8 @@ list(#{node := Node} = Bindings, Params) ->
Topic0 -> Topic0 ->
Topic = emqx_mgmt_util:urldecode(Topic0), Topic = emqx_mgmt_util:urldecode(Topic0),
Data = emqx_mgmt:list_subscriptions_via_topic(Node, Topic, ?format_fun), Data = emqx_mgmt:list_subscriptions_via_topic(Node, Topic, ?format_fun),
minirest:return({ok, add_meta(Params, Data)}) FilterData = filter_subscriptions(Data, Params),
minirest:return({ok, add_meta(Params, FilterData)})
end. end.
add_meta(Params, List) -> add_meta(Params, List) ->
@ -169,3 +171,30 @@ update_ms(share, X, {{Pid, Topic}, Opts}) ->
{{Pid, Topic}, Opts#{share => X}}; {{Pid, Topic}, Opts#{share => X}};
update_ms(qos, X, {{Pid, Topic}, Opts}) -> update_ms(qos, X, {{Pid, Topic}, Opts}) ->
{{Pid, Topic}, Opts#{qos => X}}. {{Pid, Topic}, Opts#{qos => X}}.
filter_subscriptions(Data0, Params) ->
Data1 = filter_by_key(qos, qos(Params), Data0),
Data2 = filter_by_key(clientid, proplists:get_value(<<"clientid">>, Params), Data1),
case proplists:get_value(<<"share">>, Params) of
undefined -> Data2;
Share ->
Prefix = filename:join([<<"$share">>, Share]),
Size = byte_size(Prefix),
lists:filter(fun(#{topic := Topic}) ->
case Topic of
<<Prefix:Size/binary, _/binary>> -> true;
_ -> false
end
end,
Data2)
end.
qos(Params) ->
case proplists:get_value(<<"qos">>, Params) of
undefined -> undefined;
Qos when is_integer(Qos) -> Qos;
Qos when is_binary(Qos) -> binary_to_integer(Qos)
end.
filter_by_key(_Key, undefined, List) -> List;
filter_by_key(Key, Value, List) -> lists:filter(fun(E) -> Value =:= maps:get(Key, E) end, List).