sergiotarxz
/
Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MastoAPI streaming: Replace access_token with Sec-WebSocket-Protocol

This commit is contained in:
KokaKiwi 2019-06-22 19:45:21 +02:00 committed by Haelwenn (lanodan) Monnier
parent 3589b30ddc
commit a7885748c7
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/mastodon_api/websocket_handler.ex
View File

@ -29,7 +29,7 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
def init(%{qs: qs} = req, state) do def init(%{qs: qs} = req, state) do
with params <- :cow_qs.parse_qs(qs), with params <- :cow_qs.parse_qs(qs),
access_token <- List.keyfind(params, "access_token", 0), access_token <- :cowboy_req.header("sec-websocket-protocol", req, 0),
{_, stream} <- List.keyfind(params, "stream", 0), {_, stream} <- List.keyfind(params, "stream", 0),
{:ok, user} <- allow_request(stream, access_token), {:ok, user} <- allow_request(stream, access_token),
topic when is_binary(topic) <- expand_topic(stream, params) do topic when is_binary(topic) <- expand_topic(stream, params) do
@ -89,7 +89,7 @@ defp allow_request(stream, nil) when stream in @anonymous_streams do
end end
# Authenticated streams. # Authenticated streams.
defp allow_request(stream, {"access_token", access_token}) when stream in @streams do defp allow_request(stream, access_token) when stream in @streams do
with %Token{user_id: user_id} <- Repo.get_by(Token, token: access_token), with %Token{user_id: user_id} <- Repo.get_by(Token, token: access_token),
user = %User{} <- User.get_cached_by_id(user_id) do user = %User{} <- User.get_cached_by_id(user_id) do
{:ok, user} {:ok, user}