diff --git a/apps/roster/src/protocol/roster_auth.erl b/apps/roster/src/protocol/roster_auth.erl index 9d979e93758c31594765a58d7e3006f1b966ef1c..4d6f829cfad5b1018ee2bd4b989309918043c6e9 100644 --- a/apps/roster/src/protocol/roster_auth.erl +++ b/apps/roster/src/protocol/roster_auth.erl @@ -36,7 +36,7 @@ check(#mqtt_client{client_id = <<"reg_", _/binary>> = ClientId, check(#mqtt_client{client_id = <<"emqttd_", _/binary>> = ClientId, username = <<"api">>, 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]), + roster:info(?MODULE, "~p:Auth:auth/check:~p~n", [ClientId,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} when Type == verified; Type == []; Type == expired -> diff --git a/apps/roster/src/roster.erl b/apps/roster/src/roster.erl index 8c8774ba001cf11857392ba2a7982d5e090e265f..1e61740f2d0ee16728ab5ce65944eae9bfd9d3d7 100644 --- a/apps/roster/src/roster.erl +++ b/apps/roster/src/roster.erl @@ -708,7 +708,8 @@ feed_key(#p2p{from = From, to = To}) -> feed_key(p2p, From, To); feed_key(#muc{} = Feed) -> Feed. ttl() -> application:get_env(roster, auth_ttl, 60 * 15). -depicle(Token) -> case n2o_secret:depickle(Token) of <<>> -> <<>>; T -> binary_to_term(T,[safe]) end. +depicle(Token) -> case n2o_secret:depickle(Token) of <<>> -> <<>>; T -> + try binary_to_term(T,[safe]) catch _:_ -> <<>> end end. gen_token([], Data) -> {'Token', n2o_secret:pickle(term_to_binary({now_msec() + ttl() * 1000, Data}))}; gen_token(Token, Data) ->