diff --git a/apps/emqx_auth_http/src/emqx_acl_http.erl b/apps/emqx_auth_http/src/emqx_acl_http.erl index 3d1a9d00a..d63c37d4c 100644 --- a/apps/emqx_auth_http/src/emqx_acl_http.erl +++ b/apps/emqx_auth_http/src/emqx_acl_http.erl @@ -41,19 +41,18 @@ check_acl(#{username := <<$$, _/binary>>}, _PubSub, _Topic, _AclResult, _Params) ok; check_acl(ClientInfo, PubSub, Topic, _AclResult, #{acl := ACLParams = #{path := Path}}) -> ClientInfo1 = ClientInfo#{access => access(PubSub), topic => Topic}, - ClientId = maps:get(clientid, ClientInfo1, undefined), Username = maps:get(username, ClientInfo1, undefined), case check_acl_request(ACLParams, ClientInfo1) of {ok, 200, <<"ignore">>} -> ok; {ok, 200, _Body} -> {stop, allow}; {ok, Code, _Body} -> - ?LOG(error, "Deny ~s ~s to topic ~s, username: ~p, http response code: ~p", - [ClientId, PubSub, Topic, Username, Code]), + ?LOG(error, "Deny ~s to topic ~s, username: ~p, http response code: ~p", + [PubSub, Topic, Username, Code]), {stop, deny}; {error, Error} -> - ?LOG(error, "Deny ~s ~s to topic ~s, username: ~p, due to request " + ?LOG(error, "Deny ~s to topic ~s, username: ~p, due to request " "http server failure, path: ~p, error: ~0p", - [ClientId, PubSub, Topic, Username, Path, Error]), + [PubSub, Topic, Username, Path, Error]), ok end. diff --git a/apps/emqx_auth_http/src/emqx_auth_http.erl b/apps/emqx_auth_http/src/emqx_auth_http.erl index f6585567b..1626bc745 100644 --- a/apps/emqx_auth_http/src/emqx_auth_http.erl +++ b/apps/emqx_auth_http/src/emqx_auth_http.erl @@ -36,7 +36,6 @@ check(ClientInfo, AuthResult, #{auth := AuthParms = #{path := Path}, super := SuperParams}) -> - ClientId = maps:get(clientid, ClientInfo, undefined), Username = maps:get(username, ClientInfo, undefined), case authenticate(AuthParms, ClientInfo) of {ok, 200, <<"ignore">>} -> @@ -48,15 +47,15 @@ check(ClientInfo, AuthResult, #{auth := AuthParms = #{path := Path}, anonymous => false, mountpoint => mountpoint(Body, ClientInfo)}}; {ok, Code, _Body} -> - ?LOG(error, "Deny connection(~s) from path: ~s, username: ~s, http " + ?LOG(error, "Deny connection from path: ~s, username: ~s, http " "response code: ~p", - [ClientId, Path, Username, Code]), + [Path, Username, Code]), {stop, AuthResult#{auth_result => http_to_connack_error(Code), anonymous => false}}; {error, Error} -> - ?LOG(error, "Deny connection(~s) from path: ~s, username: ~s, due to " + ?LOG(error, "Deny connection from path: ~s, username: ~s, due to " "request http-server failed: ~0p", - [ClientId, Path, Username, Error]), + [Path, Username, Error]), %%FIXME later: server_unavailable is not right. {stop, AuthResult#{auth_result => server_unavailable, anonymous => false}}