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

Merge pull request #7834 from zhongwencool/use-username-as-clientid-not-found 

fix: client not found if use_username_as_clientid=true
This commit is contained in:
zhouzb 2022-04-29 17:24:24 +08:00 committed by GitHub
parent d36d27c533 cf9a853069
commit 8377af127d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -811,17 +811,19 @@ run_fuzzy_filter(E = {_, #{clientinfo := ClientInfo}, _}, [{Key, like, SubStr} |
%%--------------------------------------------------------------------
%% format funcs
format_channel_info({_, ClientInfo, ClientStats}) ->
format_channel_info({_, ClientInfo0, ClientStats}) ->
Node =
case ClientInfo of
case ClientInfo0 of
#{node := N} -> N;
_ -> node()
end,
ClientInfo1 = emqx_map_lib:deep_remove([conninfo, clientid], ClientInfo0),
ClientInfo2 = emqx_map_lib:deep_remove([conninfo, username], ClientInfo1),
StatsMap = maps:without(
[memory, next_pkt_id, total_heap_size],
maps:from_list(ClientStats)
),
ClientInfoMap0 = maps:fold(fun take_maps_from_inner/3, #{}, ClientInfo),
ClientInfoMap0 = maps:fold(fun take_maps_from_inner/3, #{}, ClientInfo2),
{IpAddress, Port} = peername_dispart(maps:get(peername, ClientInfoMap0)),
Connected = maps:get(conn_state, ClientInfoMap0) =:= connected,
ClientInfoMap1 = maps:merge(StatsMap, ClientInfoMap0),
@ -829,6 +831,7 @@ format_channel_info({_, ClientInfo, ClientStats}) ->
ClientInfoMap3 = maps:put(ip_address, IpAddress, ClientInfoMap2),
ClientInfoMap4 = maps:put(port, Port, ClientInfoMap3),
ClientInfoMap = maps:put(connected, Connected, ClientInfoMap4),
RemoveList =
[
auth_result,