summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2024-11-13 08:22:44 +0000
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2024-11-26 14:06:31 +0100
commit53c2d2cd87d35094b0ae623b8daab4d303ed5fcb (patch)
treefdab300b9dbcd8e4d35850875d8a94dcf55cea7f /test
parentf45f17b5ff4e0bc454d9340c500e8b923c9e57cb (diff)
downloadpleroma-53c2d2cd87d35094b0ae623b8daab4d303ed5fcb.tar.gz
pleroma-53c2d2cd87d35094b0ae623b8daab4d303ed5fcb.zip
Merge branch 'mastodon-websocket-fix' into 'develop'
Fix Mastodon WebSocket authentication See merge request pleroma/pleroma!4206
Diffstat (limited to 'test')
-rw-r--r--test/pleroma/integration/mastodon_websocket_test.exs11
1 files changed, 11 insertions, 0 deletions
diff --git a/test/pleroma/integration/mastodon_websocket_test.exs b/test/pleroma/integration/mastodon_websocket_test.exs
index f499f54ad..88f32762d 100644
--- a/test/pleroma/integration/mastodon_websocket_test.exs
+++ b/test/pleroma/integration/mastodon_websocket_test.exs
@@ -268,6 +268,17 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
end)
end
+ test "accepts valid token on Sec-WebSocket-Protocol header", %{token: token} do
+ assert {:ok, _} = start_socket("?stream=user", [{"Sec-WebSocket-Protocol", token.token}])
+
+ capture_log(fn ->
+ assert {:error, %WebSockex.RequestError{code: 401}} =
+ start_socket("?stream=user", [{"Sec-WebSocket-Protocol", "I am a friend"}])
+
+ Process.sleep(30)
+ end)
+ end
+
test "accepts valid token on client-sent event", %{token: token} do
assert {:ok, pid} = start_socket()