From 4026b881c70c60ea4b8b613ddf2a80f645ce19e5 Mon Sep 17 00:00:00 2001 From: gspasov Date: Thu, 18 Apr 2019 11:43:46 +0300 Subject: [PATCH] Added log for WS Headers. Removed n2o_auth from acl check --- apps/roster/src/protocol/roster_auth.erl | 3 ++- apps/roster/src/roster.erl | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/roster/src/protocol/roster_auth.erl b/apps/roster/src/protocol/roster_auth.erl index 2cf3389db..9d979e937 100644 --- a/apps/roster/src/protocol/roster_auth.erl +++ b/apps/roster/src/protocol/roster_auth.erl @@ -34,7 +34,8 @@ check(#mqtt_client{client_id = <<"reg_", _/binary>> = ClientId, _ -> {error, invalid_version} end; check(#mqtt_client{client_id = <<"emqttd_", _/binary>> = ClientId, username = <<"api">>, - client_pid = ClientPid, will_topic = WT, peername = {Ip, _}} = MC, Token, State) -> + client_pid = ClientPid, will_topic = WT, peername = {Ip, _}, ws_initial_headers = Headers} = MC, Token, State) -> + roster:info(?MODULE, "[WS Headers]: ~p", [Headers]), roster:info(?MODULE, "~p:Auth:auth/check:~p~p", [ClientId, lists:sublist(binary_to_list(Token), 16),WT]), case case State of #'Auth'{} -> {ok, State}; _ -> kvs:get('Auth', ClientId) end of {ok, #'Auth'{type = Type, token = Token, settings = Settings, last_online = LO} = Auth} diff --git a/apps/roster/src/roster.erl b/apps/roster/src/roster.erl index e47837f2e..befc391ea 100644 --- a/apps/roster/src/roster.erl +++ b/apps/roster/src/roster.erl @@ -51,7 +51,6 @@ start(_, _) -> atoms(), catch load([]), application:stop(n2o), application:start(n2o), X = try begin A = supervisor:start_link({local, roster}, roster, []), - emqttd_access_control:register_mod(auth, n2o_auth, [[]], 9997), emqttd_access_control:register_mod(auth, roster_auth, [[]], 9998), emqttd_access_control:register_mod(auth, micro_auth, [[]], 9996), register_acl_mod(), -- GitLab