Merge branch 'develop' into issue-7887-featured-collection
This commit is contained in:
commit
33fdc59bc1
17 changed files with 418 additions and 65 deletions
|
|
@ -1,5 +1,6 @@
|
||||||
when:
|
when:
|
||||||
- event: pull_request
|
- event: pull_request
|
||||||
|
evaluate: 'CI_COMMIT_SOURCE_BRANCH != "weblate"'
|
||||||
|
|
||||||
labels:
|
labels:
|
||||||
platform: linux/amd64
|
platform: linux/amd64
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
when:
|
when:
|
||||||
- event: pull_request
|
- event: pull_request
|
||||||
path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
|
path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
|
||||||
|
evaluate: 'CI_COMMIT_SOURCE_BRANCH != "weblate"'
|
||||||
- event: push
|
- event: push
|
||||||
branch: ${CI_REPO_DEFAULT_BRANCH}
|
branch: ${CI_REPO_DEFAULT_BRANCH}
|
||||||
path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
|
path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
when:
|
when:
|
||||||
- event: pull_request
|
- event: pull_request
|
||||||
path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
|
path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
|
||||||
|
evaluate: 'CI_COMMIT_SOURCE_BRANCH != "weblate"'
|
||||||
- event: push
|
- event: push
|
||||||
branch: ${CI_REPO_DEFAULT_BRANCH}
|
branch: ${CI_REPO_DEFAULT_BRANCH}
|
||||||
path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
|
path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
when:
|
when:
|
||||||
- event: pull_request
|
- event: pull_request
|
||||||
path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
|
path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
|
||||||
|
evaluate: 'CI_COMMIT_SOURCE_BRANCH != "weblate"'
|
||||||
- event: push
|
- event: push
|
||||||
branch: ${CI_REPO_DEFAULT_BRANCH}
|
branch: ${CI_REPO_DEFAULT_BRANCH}
|
||||||
path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
|
path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
|
||||||
|
|
|
||||||
1
changelog.d/mastodon-websocket-protocol.fix
Normal file
1
changelog.d/mastodon-websocket-protocol.fix
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Echo Mastodon-style `Sec-WebSocket-Protocol` tokens in streaming WebSocket handshakes.
|
||||||
0
changelog.d/mfm-extend.skip
Normal file
0
changelog.d/mfm-extend.skip
Normal file
0
changelog.d/weblate-ci.skip
Normal file
0
changelog.d/weblate-ci.skip
Normal file
1
changelog.d/wss-necroposts.fix
Normal file
1
changelog.d/wss-necroposts.fix
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
RichMedia: Fix backfill causing old posts to show up on timelines by disabling it in MastoAPI StatusView
|
||||||
|
|
@ -9,8 +9,8 @@ defmodule Pleroma.Web.Endpoint do
|
||||||
|
|
||||||
alias Pleroma.Config
|
alias Pleroma.Config
|
||||||
|
|
||||||
socket("/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler,
|
plug(Pleroma.Web.MastodonAPI.WebsocketPlug,
|
||||||
longpoll: false,
|
path: "/api/v1/streaming",
|
||||||
websocket: [
|
websocket: [
|
||||||
path: "/",
|
path: "/",
|
||||||
compress: false,
|
compress: false,
|
||||||
|
|
@ -169,8 +169,7 @@ defmodule Pleroma.Web.Endpoint do
|
||||||
else: "pleroma_key"
|
else: "pleroma_key"
|
||||||
|
|
||||||
extra =
|
extra =
|
||||||
Config.get([__MODULE__, :extra_cookie_attrs])
|
Enum.join(Config.get([__MODULE__, :extra_cookie_attrs]), ";")
|
||||||
|> Enum.join(";")
|
|
||||||
|
|
||||||
# The session will be stored in the cookie and signed,
|
# The session will be stored in the cookie and signed,
|
||||||
# this means its contents can be read but not tampered with.
|
# this means its contents can be read but not tampered with.
|
||||||
|
|
|
||||||
|
|
@ -28,9 +28,13 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|
||||||
# This is a naive way to do this, just spawning a process per activity
|
# This is a naive way to do this, just spawning a process per activity
|
||||||
# to fetch the preview. However it should be fine considering
|
# to fetch the preview. However it should be fine considering
|
||||||
# pagination is restricted to 40 activities at a time
|
# pagination is restricted to 40 activities at a time
|
||||||
defp fetch_rich_media_for_activities(activities) do
|
# Force disable Websockets streaming for backfill jobs,
|
||||||
|
# otherwise old posts can show up on timelines.
|
||||||
|
defp fetch_rich_media_for_activities(activities, opts) do
|
||||||
|
opts = Map.put(opts, :stream, false)
|
||||||
|
|
||||||
Enum.each(activities, fn activity ->
|
Enum.each(activities, fn activity ->
|
||||||
Card.get_by_activity(activity)
|
Card.get_by_activity(activity, opts)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -113,7 +117,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|
||||||
activities = Enum.filter(opts.activities, & &1)
|
activities = Enum.filter(opts.activities, & &1)
|
||||||
|
|
||||||
# Start prefetching rich media before doing anything else
|
# Start prefetching rich media before doing anything else
|
||||||
fetch_rich_media_for_activities(activities)
|
fetch_rich_media_for_activities(activities, opts)
|
||||||
|
|
||||||
replied_to_activities = get_replied_to_activities(activities)
|
replied_to_activities = get_replied_to_activities(activities)
|
||||||
quoted_activities = get_quoted_activities(activities)
|
quoted_activities = get_quoted_activities(activities)
|
||||||
|
|
||||||
|
|
@ -361,8 +366,10 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|
||||||
|
|
||||||
summary = object.data["summary"] || ""
|
summary = object.data["summary"] || ""
|
||||||
|
|
||||||
|
# Force disable Websockets streaming for backfill jobs which the below call will create,
|
||||||
|
# otherwise old posts can show up on timelines.
|
||||||
card =
|
card =
|
||||||
case Card.get_by_activity(activity) do
|
case Card.get_by_activity(activity, Map.put(opts, :stream, false)) do
|
||||||
%Card{} = result -> render("card.json", result)
|
%Card{} = result -> render("card.json", result)
|
||||||
_ -> nil
|
_ -> nil
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -67,9 +67,10 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
|
||||||
|
|
||||||
@impl Phoenix.Socket.Transport
|
@impl Phoenix.Socket.Transport
|
||||||
def handle_in({text, [opcode: :text]}, state) do
|
def handle_in({text, [opcode: :text]}, state) do
|
||||||
with {:ok, %{} = event} <- Jason.decode(text) do
|
case Jason.decode(text) do
|
||||||
handle_client_event(event, state)
|
{:ok, %{} = event} ->
|
||||||
else
|
handle_client_event(event, state)
|
||||||
|
|
||||||
_ ->
|
_ ->
|
||||||
Logger.error("#{__MODULE__} received non-JSON event: #{inspect(text)}")
|
Logger.error("#{__MODULE__} received non-JSON event: #{inspect(text)}")
|
||||||
{:ok, state}
|
{:ok, state}
|
||||||
|
|
@ -85,11 +86,11 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
|
||||||
def handle_info({:render_with_user, view, template, item, topic}, state) do
|
def handle_info({:render_with_user, view, template, item, topic}, state) do
|
||||||
user = %User{} = User.get_cached_by_ap_id(state.user.ap_id)
|
user = %User{} = User.get_cached_by_ap_id(state.user.ap_id)
|
||||||
|
|
||||||
unless Streamer.filtered_by_user?(user, item) do
|
if Streamer.filtered_by_user?(user, item) do
|
||||||
|
{:ok, state}
|
||||||
|
else
|
||||||
message = view.render(template, item, user, topic)
|
message = view.render(template, item, user, topic)
|
||||||
{:push, {:text, message}, %{state | user: user}}
|
{:push, {:text, message}, %{state | user: user}}
|
||||||
else
|
|
||||||
{:ok, state}
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -253,7 +254,7 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
|
||||||
|
|
||||||
defp find_sec_websocket_protocol(sec_headers) do
|
defp find_sec_websocket_protocol(sec_headers) do
|
||||||
Enum.find_value(sec_headers, fn
|
Enum.find_value(sec_headers, fn
|
||||||
{"sec-websocket-protocol", token} -> token
|
{"sec-websocket-protocol", protocols} -> protocols |> Plug.Conn.Utils.list() |> List.first()
|
||||||
_ -> nil
|
_ -> nil
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
104
lib/pleroma/web/mastodon_api/websocket_plug.ex
Normal file
104
lib/pleroma/web/mastodon_api/websocket_plug.ex
Normal file
|
|
@ -0,0 +1,104 @@
|
||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.Web.MastodonAPI.WebsocketPlug do
|
||||||
|
@moduledoc """
|
||||||
|
A Phoenix 1.8 compatible WebSocket transport for Mastodon streaming.
|
||||||
|
|
||||||
|
It mirrors Phoenix.Transports.WebSocket, but echoes a successfully authenticated
|
||||||
|
Mastodon-style Sec-WebSocket-Protocol token so browser clients accept the handshake.
|
||||||
|
"""
|
||||||
|
|
||||||
|
@behaviour Plug
|
||||||
|
|
||||||
|
import Plug.Conn
|
||||||
|
|
||||||
|
alias Phoenix.Socket.Transport
|
||||||
|
alias Pleroma.Web.Endpoint
|
||||||
|
alias Pleroma.Web.MastodonAPI.WebsocketHandler
|
||||||
|
|
||||||
|
@connect_info_opts [:check_csrf]
|
||||||
|
|
||||||
|
@impl Plug
|
||||||
|
def init(opts) do
|
||||||
|
path = String.split(Keyword.fetch!(opts, :path), "/", trim: true)
|
||||||
|
websocket = Keyword.fetch!(opts, :websocket)
|
||||||
|
config = Transport.load_config(websocket, Phoenix.Transports.WebSocket)
|
||||||
|
|
||||||
|
{path, config}
|
||||||
|
end
|
||||||
|
|
||||||
|
@impl Plug
|
||||||
|
def call(%{method: "GET", path_info: path} = conn, {path, opts}) do
|
||||||
|
conn
|
||||||
|
|> fetch_query_params()
|
||||||
|
|> Transport.code_reload(Endpoint, opts)
|
||||||
|
|> Transport.transport_log(opts[:transport_log])
|
||||||
|
|> Transport.check_origin(WebsocketHandler, Endpoint, opts)
|
||||||
|
|> connect(opts)
|
||||||
|
end
|
||||||
|
|
||||||
|
def call(%{path_info: path} = conn, {path, _opts}) do
|
||||||
|
conn
|
||||||
|
|> send_resp(400, "")
|
||||||
|
|> halt()
|
||||||
|
end
|
||||||
|
|
||||||
|
def call(conn, _opts), do: conn
|
||||||
|
|
||||||
|
defp connect(%{halted: true} = conn, _opts), do: conn
|
||||||
|
|
||||||
|
defp connect(%{params: params} = conn, opts) do
|
||||||
|
keys = Keyword.get(opts, :connect_info, [])
|
||||||
|
|
||||||
|
connect_info =
|
||||||
|
Transport.connect_info(conn, Endpoint, keys, Keyword.take(opts, @connect_info_opts))
|
||||||
|
|
||||||
|
config = %{
|
||||||
|
endpoint: Endpoint,
|
||||||
|
transport: :websocket,
|
||||||
|
options: opts,
|
||||||
|
params: params,
|
||||||
|
connect_info: connect_info
|
||||||
|
}
|
||||||
|
|
||||||
|
case WebsocketHandler.connect(config) do
|
||||||
|
{:ok, arg} ->
|
||||||
|
try do
|
||||||
|
conn
|
||||||
|
|> echo_sec_websocket_protocol()
|
||||||
|
|> WebSockAdapter.upgrade(WebsocketHandler, arg, opts)
|
||||||
|
|> halt()
|
||||||
|
rescue
|
||||||
|
e in WebSockAdapter.UpgradeError ->
|
||||||
|
conn
|
||||||
|
|> send_resp(400, e.message)
|
||||||
|
|> halt()
|
||||||
|
end
|
||||||
|
|
||||||
|
:error ->
|
||||||
|
conn
|
||||||
|
|> send_resp(403, "")
|
||||||
|
|> halt()
|
||||||
|
|
||||||
|
{:error, reason} ->
|
||||||
|
{m, f, args} = opts[:error_handler]
|
||||||
|
|
||||||
|
halt(apply(m, f, [conn, reason | args]))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp echo_sec_websocket_protocol(conn) do
|
||||||
|
case get_req_header(conn, "sec-websocket-protocol") do
|
||||||
|
[protocols | _] ->
|
||||||
|
case Plug.Conn.Utils.list(protocols) do
|
||||||
|
[protocol | _] -> put_resp_header(conn, "sec-websocket-protocol", protocol)
|
||||||
|
[] -> conn
|
||||||
|
end
|
||||||
|
|
||||||
|
[] ->
|
||||||
|
conn
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
@ -11,6 +11,8 @@ defmodule Pleroma.Web.RichMedia.Backfill do
|
||||||
|
|
||||||
require Logger
|
require Logger
|
||||||
|
|
||||||
|
@callback run(map()) :: :ok | Parser.parse_errors() | Helpers.get_errors()
|
||||||
|
|
||||||
@cachex Pleroma.Config.get([:cachex, :provider], Cachex)
|
@cachex Pleroma.Config.get([:cachex, :provider], Cachex)
|
||||||
@stream_out_impl Pleroma.Config.get(
|
@stream_out_impl Pleroma.Config.get(
|
||||||
[__MODULE__, :stream_out],
|
[__MODULE__, :stream_out],
|
||||||
|
|
@ -26,11 +28,7 @@ defmodule Pleroma.Web.RichMedia.Backfill do
|
||||||
{:ok, card} = Card.create(url, fields)
|
{:ok, card} = Card.create(url, fields)
|
||||||
|
|
||||||
maybe_schedule_expiration(url, fields)
|
maybe_schedule_expiration(url, fields)
|
||||||
|
maybe_update_stream(args)
|
||||||
with %{"activity_id" => activity_id} <- args,
|
|
||||||
false <- is_nil(activity_id) do
|
|
||||||
stream_update(args)
|
|
||||||
end
|
|
||||||
|
|
||||||
warm_cache(url_hash, card)
|
warm_cache(url_hash, card)
|
||||||
:ok
|
:ok
|
||||||
|
|
@ -55,12 +53,17 @@ defmodule Pleroma.Web.RichMedia.Backfill do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
defp stream_update(%{"activity_id" => activity_id}) do
|
defp maybe_update_stream(%{"activity_id" => activity_id, "stream" => true})
|
||||||
|
when is_binary(activity_id) do
|
||||||
Pleroma.Activity.get_by_id(activity_id)
|
Pleroma.Activity.get_by_id(activity_id)
|
||||||
|> Pleroma.Activity.normalize()
|
|> Pleroma.Activity.normalize()
|
||||||
|> @stream_out_impl.stream_out()
|
|> @stream_out_impl.stream_out()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Streamer.stream_out returns noop when unsupported activity type is requested to be streamed.
|
||||||
|
# Do the same here for unwanted streaming
|
||||||
|
defp maybe_update_stream(_), do: :noop
|
||||||
|
|
||||||
defp warm_cache(key, val), do: @cachex.put(:rich_media_cache, key, val)
|
defp warm_cache(key, val), do: @cachex.put(:rich_media_cache, key, val)
|
||||||
|
|
||||||
defp negative_cache(key, ttl \\ :timer.minutes(15)),
|
defp negative_cache(key, ttl \\ :timer.minutes(15)),
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,18 @@ defmodule Pleroma.Web.RichMedia.Card do
|
||||||
nil ->
|
nil ->
|
||||||
activity_id = Keyword.get(opts, :activity_id, nil)
|
activity_id = Keyword.get(opts, :activity_id, nil)
|
||||||
|
|
||||||
RichMediaWorker.new(%{"op" => "backfill", "url" => url, "activity_id" => activity_id})
|
# Nested opts, first layer comes from get_by_activity/2 as Keyword,
|
||||||
|
# second from API views/Federation as Map.
|
||||||
|
# Provide default Map when called directly.
|
||||||
|
opts = Keyword.get(opts, :opts, %{})
|
||||||
|
stream = Map.get(opts, :stream, true)
|
||||||
|
|
||||||
|
RichMediaWorker.new(%{
|
||||||
|
"op" => "backfill",
|
||||||
|
"url" => url,
|
||||||
|
"activity_id" => activity_id,
|
||||||
|
"stream" => stream
|
||||||
|
})
|
||||||
|> Oban.insert()
|
|> Oban.insert()
|
||||||
|
|
||||||
nil
|
nil
|
||||||
|
|
@ -112,9 +123,11 @@ defmodule Pleroma.Web.RichMedia.Card do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@spec get_by_activity(Activity.t()) :: t() | nil | :error
|
@spec get_by_activity(Activity.t(), %{}) :: t() | nil | :error
|
||||||
|
def get_by_activity(activity, opts \\ %{})
|
||||||
|
|
||||||
# Fake/Draft activity
|
# Fake/Draft activity
|
||||||
def get_by_activity(%Activity{id: "pleroma:fakeid"} = activity) do
|
def get_by_activity(%Activity{id: "pleroma:fakeid"} = activity, _opts) do
|
||||||
with {_, true} <- {:config, @config_impl.get([:rich_media, :enabled])},
|
with {_, true} <- {:config, @config_impl.get([:rich_media, :enabled])},
|
||||||
%Object{} = object <- Object.normalize(activity, fetch: false),
|
%Object{} = object <- Object.normalize(activity, fetch: false),
|
||||||
url when not is_nil(url) <- HTML.extract_first_external_url_from_object(object) do
|
url when not is_nil(url) <- HTML.extract_first_external_url_from_object(object) do
|
||||||
|
|
@ -138,13 +151,13 @@ defmodule Pleroma.Web.RichMedia.Card do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def get_by_activity(activity) do
|
def get_by_activity(activity, opts) do
|
||||||
with %Object{} = object <- Object.normalize(activity, fetch: false),
|
with %Object{} = object <- Object.normalize(activity, fetch: false),
|
||||||
{_, nil} <- {:cached, get_cached_url(object, activity.id)} do
|
{_, nil} <- {:cached, get_cached_url(object, activity.id)} do
|
||||||
nil
|
nil
|
||||||
else
|
else
|
||||||
{:cached, url} ->
|
{:cached, url} ->
|
||||||
get_or_backfill_by_url(url, activity_id: activity.id)
|
get_or_backfill_by_url(url, activity_id: activity.id, opts: opts)
|
||||||
|
|
||||||
_ ->
|
_ ->
|
||||||
:error
|
:error
|
||||||
|
|
|
||||||
|
|
@ -83,48 +83,57 @@ defmodule Pleroma.HTML.Scrubber.Default do
|
||||||
"quote-inline",
|
"quote-inline",
|
||||||
"invisible",
|
"invisible",
|
||||||
"ellipsis",
|
"ellipsis",
|
||||||
"mfm-center",
|
"mfm-tada",
|
||||||
"mfm-flip",
|
|
||||||
"mfm-font",
|
|
||||||
"mfm-blur",
|
|
||||||
"mfm-rotate",
|
|
||||||
"mfm-x2",
|
|
||||||
"mfm-x3",
|
|
||||||
"mfm-x4",
|
|
||||||
"mfm-position",
|
|
||||||
"mfm-scale",
|
|
||||||
"mfm-fg",
|
|
||||||
"mfm-bg",
|
|
||||||
"mfm-jelly",
|
"mfm-jelly",
|
||||||
"mfm-twitch",
|
"mfm-twitch",
|
||||||
"mfm-shake",
|
"mfm-shake",
|
||||||
"mfm-spin",
|
"mfm-spin",
|
||||||
"mfm-jump",
|
"mfm-jump",
|
||||||
"mfm-bounce",
|
"mfm-bounce",
|
||||||
|
"mfm-flip",
|
||||||
|
"mfm-x2",
|
||||||
|
"mfm-x3",
|
||||||
|
"mfm-x4",
|
||||||
|
"mfm-scale",
|
||||||
|
"mfm-position",
|
||||||
|
"mfm-fg",
|
||||||
|
"mfm-bg",
|
||||||
|
"mfm-border",
|
||||||
|
"mfm-font",
|
||||||
|
"mfm-blur",
|
||||||
"mfm-rainbow",
|
"mfm-rainbow",
|
||||||
"mfm-tada",
|
"mfm-sparkle",
|
||||||
"mfm-sparkle"
|
"mfm-rotate",
|
||||||
|
"mfm-ruby",
|
||||||
|
"mfm-unixtime",
|
||||||
|
# Exists in Akkoma but not Misskey?
|
||||||
|
"mfm-center"
|
||||||
])
|
])
|
||||||
|
|
||||||
Meta.allow_tag_with_this_attribute_values(:p, "class", ["quote-inline"])
|
Meta.allow_tag_with_this_attribute_values(:p, "class", ["quote-inline"])
|
||||||
|
|
||||||
Meta.allow_tag_with_these_attributes(:span, [
|
Meta.allow_tag_with_these_attributes(:span, [
|
||||||
"lang",
|
"lang",
|
||||||
"data-mfm-h",
|
"data-mfm-speed",
|
||||||
"data-mfm-v",
|
"data-mfm-delay",
|
||||||
|
"data-mfm-left",
|
||||||
|
"data-mfm-alternate",
|
||||||
"data-mfm-x",
|
"data-mfm-x",
|
||||||
"data-mfm-y",
|
"data-mfm-y",
|
||||||
"data-mfm-alternate",
|
"data-mfm-h",
|
||||||
"data-mfm-speed",
|
"data-mfm-v",
|
||||||
"data-mfm-deg",
|
"data-mfm-color",
|
||||||
"data-mfm-left",
|
"data-mfm-width",
|
||||||
|
"data-mfm-style",
|
||||||
|
"data-mfm-radius",
|
||||||
|
"data-mfm-noclip",
|
||||||
"data-mfm-serif",
|
"data-mfm-serif",
|
||||||
"data-mfm-monospace",
|
"data-mfm-monospace",
|
||||||
"data-mfm-cursive",
|
"data-mfm-cursive",
|
||||||
"data-mfm-fantasy",
|
"data-mfm-fantasy",
|
||||||
"data-mfm-emoji",
|
"data-mfm-emoji",
|
||||||
"data-mfm-math",
|
"data-mfm-math",
|
||||||
"data-mfm-color"
|
"data-mfm-deg"
|
||||||
])
|
])
|
||||||
|
|
||||||
Meta.allow_tag_with_this_attribute_values(:code, "class", ["inline"])
|
Meta.allow_tag_with_this_attribute_values(:code, "class", ["inline"])
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
|
||||||
|
|
||||||
alias Pleroma.Integration.WebsocketClient
|
alias Pleroma.Integration.WebsocketClient
|
||||||
alias Pleroma.Web.CommonAPI
|
alias Pleroma.Web.CommonAPI
|
||||||
|
alias Pleroma.Web.MastodonAPI.StatusView
|
||||||
alias Pleroma.Web.OAuth
|
alias Pleroma.Web.OAuth
|
||||||
|
|
||||||
@moduletag needs_streamer: true, capture_log: true
|
@moduletag needs_streamer: true, capture_log: true
|
||||||
|
|
@ -31,6 +32,48 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
|
||||||
WebsocketClient.start_link(self(), path, headers)
|
WebsocketClient.start_link(self(), path, headers)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp raw_websocket_handshake(qs, headers) do
|
||||||
|
uri = URI.parse(@path <> qs)
|
||||||
|
port = uri.port || 80
|
||||||
|
path = uri.path <> if(uri.query, do: "?" <> uri.query, else: "")
|
||||||
|
|
||||||
|
default_headers = [
|
||||||
|
{"host", "#{uri.host}:#{port}"},
|
||||||
|
{"upgrade", "websocket"},
|
||||||
|
{"connection", "Upgrade"},
|
||||||
|
{"sec-websocket-key", Base.encode64(:crypto.strong_rand_bytes(16))},
|
||||||
|
{"sec-websocket-version", "13"}
|
||||||
|
]
|
||||||
|
|
||||||
|
request = [
|
||||||
|
"GET #{path} HTTP/1.1\r\n",
|
||||||
|
Enum.map(default_headers ++ headers, fn {name, value} -> "#{name}: #{value}\r\n" end),
|
||||||
|
"\r\n"
|
||||||
|
]
|
||||||
|
|
||||||
|
with {:ok, socket} <-
|
||||||
|
:gen_tcp.connect(String.to_charlist(uri.host), port, [:binary, active: false], 1_000),
|
||||||
|
:ok <- :gen_tcp.send(socket, request),
|
||||||
|
{:ok, response} <- :gen_tcp.recv(socket, 0, 1_000) do
|
||||||
|
:gen_tcp.close(socket)
|
||||||
|
{:ok, parse_http_response(response)}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp parse_http_response(response) do
|
||||||
|
[headers | _] = String.split(response, "\r\n\r\n", parts: 2)
|
||||||
|
[status_line | header_lines] = String.split(headers, "\r\n")
|
||||||
|
[_, status | _] = String.split(status_line, " ")
|
||||||
|
|
||||||
|
headers =
|
||||||
|
Enum.map(header_lines, fn line ->
|
||||||
|
[name, value] = String.split(line, ":", parts: 2)
|
||||||
|
{String.downcase(name), String.trim(value)}
|
||||||
|
end)
|
||||||
|
|
||||||
|
%{status: String.to_integer(status), headers: headers}
|
||||||
|
end
|
||||||
|
|
||||||
defp decode_json(json) do
|
defp decode_json(json) do
|
||||||
with {:ok, %{"event" => event, "payload" => payload_text}} <- Jason.decode(json),
|
with {:ok, %{"event" => event, "payload" => payload_text}} <- Jason.decode(json),
|
||||||
{:ok, payload} <- Jason.decode(payload_text) do
|
{:ok, payload} <- Jason.decode(payload_text) do
|
||||||
|
|
@ -85,9 +128,7 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
|
||||||
assert json["payload"]
|
assert json["payload"]
|
||||||
assert {:ok, json} = Jason.decode(json["payload"])
|
assert {:ok, json} = Jason.decode(json["payload"])
|
||||||
|
|
||||||
view_json =
|
view_json = atom_key_to_string(StatusView.render("show.json", activity: activity, for: nil))
|
||||||
Pleroma.Web.MastodonAPI.StatusView.render("show.json", activity: activity, for: nil)
|
|
||||||
|> atom_key_to_string()
|
|
||||||
|
|
||||||
assert json == view_json
|
assert json == view_json
|
||||||
end
|
end
|
||||||
|
|
@ -114,10 +155,7 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
|
||||||
assert json["payload"]
|
assert json["payload"]
|
||||||
assert {:ok, json} = Jason.decode(json["payload"])
|
assert {:ok, json} = Jason.decode(json["payload"])
|
||||||
|
|
||||||
view_json =
|
view_json = atom_key_to_string(StatusView.render("show.json", activity: activity, for: nil))
|
||||||
Pleroma.Web.MastodonAPI.StatusView.render("show.json", activity: activity, for: nil)
|
|
||||||
|> Jason.encode!()
|
|
||||||
|> Jason.decode!()
|
|
||||||
|
|
||||||
assert json == view_json
|
assert json == view_json
|
||||||
end
|
end
|
||||||
|
|
@ -279,6 +317,34 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "echoes the Sec-WebSocket-Protocol token in the handshake", %{token: token} do
|
||||||
|
assert {:ok, %{status: 101, headers: headers}} =
|
||||||
|
raw_websocket_handshake("?stream=user", [
|
||||||
|
{"sec-websocket-protocol", token.token}
|
||||||
|
])
|
||||||
|
|
||||||
|
assert {"sec-websocket-protocol", token.token} in headers
|
||||||
|
end
|
||||||
|
|
||||||
|
test "echoes the selected Sec-WebSocket-Protocol token", %{token: token} do
|
||||||
|
assert {:ok, %{status: 101, headers: headers}} =
|
||||||
|
raw_websocket_handshake("?stream=user", [
|
||||||
|
{"sec-websocket-protocol", "#{token.token}, phoenix"}
|
||||||
|
])
|
||||||
|
|
||||||
|
assert {"sec-websocket-protocol", token.token} in headers
|
||||||
|
end
|
||||||
|
|
||||||
|
test "does not echo an invalid Sec-WebSocket-Protocol token", %{token: token} do
|
||||||
|
assert {:ok, %{status: 401, headers: headers}} =
|
||||||
|
raw_websocket_handshake("?stream=user", [
|
||||||
|
{"sec-websocket-protocol", "invalid"}
|
||||||
|
])
|
||||||
|
|
||||||
|
refute {"sec-websocket-protocol", token.token} in headers
|
||||||
|
refute List.keymember?(headers, "sec-websocket-protocol", 0)
|
||||||
|
end
|
||||||
|
|
||||||
test "prefers sec-websocket-protocol token over query access_token", %{
|
test "prefers sec-websocket-protocol token over query access_token", %{
|
||||||
token: token,
|
token: token,
|
||||||
user: user
|
user: user
|
||||||
|
|
@ -450,12 +516,12 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
|
||||||
assert {:ok, json} = Jason.decode(json["payload"])
|
assert {:ok, json} = Jason.decode(json["payload"])
|
||||||
|
|
||||||
view_json =
|
view_json =
|
||||||
Pleroma.Web.MastodonAPI.StatusView.render("show.json",
|
atom_key_to_string(
|
||||||
activity: activity,
|
StatusView.render("show.json",
|
||||||
for: reading_user
|
activity: activity,
|
||||||
|
for: reading_user
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|> Jason.encode!()
|
|
||||||
|> Jason.decode!()
|
|
||||||
|
|
||||||
assert json == view_json
|
assert json == view_json
|
||||||
end
|
end
|
||||||
|
|
@ -478,12 +544,12 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
|
||||||
activity = Pleroma.Activity.normalize(activity)
|
activity = Pleroma.Activity.normalize(activity)
|
||||||
|
|
||||||
view_json =
|
view_json =
|
||||||
Pleroma.Web.MastodonAPI.StatusView.render("show.json",
|
atom_key_to_string(
|
||||||
activity: activity,
|
StatusView.render("show.json",
|
||||||
for: reading_user
|
activity: activity,
|
||||||
|
for: reading_user
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|> Jason.encode!()
|
|
||||||
|> Jason.decode!()
|
|
||||||
|
|
||||||
assert {:ok, %{"event" => "status.update", "payload" => ^view_json}} = decode_json(raw_json)
|
assert {:ok, %{"event" => "status.update", "payload" => ^view_json}} = decode_json(raw_json)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,22 @@
|
||||||
defmodule Pleroma.Web.RichMedia.BackfillTest do
|
defmodule Pleroma.Web.RichMedia.BackfillTest do
|
||||||
use Pleroma.DataCase
|
use Pleroma.DataCase
|
||||||
|
|
||||||
|
alias Pleroma.Tests.ObanHelpers
|
||||||
|
alias Pleroma.Web.CommonAPI
|
||||||
alias Pleroma.Web.RichMedia.Backfill
|
alias Pleroma.Web.RichMedia.Backfill
|
||||||
alias Pleroma.Web.RichMedia.Card
|
alias Pleroma.Web.RichMedia.Card
|
||||||
|
|
||||||
import Mox
|
import Mox
|
||||||
|
import Pleroma.Factory
|
||||||
|
|
||||||
setup_all do: clear_config([:rich_media, :enabled], true)
|
setup do
|
||||||
|
clear_config([:rich_media, :enabled], true)
|
||||||
|
|
||||||
|
Mox.stub_with(Pleroma.UnstubbedConfigMock, Pleroma.Test.StaticConfig)
|
||||||
|
Mox.stub_with(Pleroma.CachexMock, Pleroma.NullCache)
|
||||||
|
|
||||||
|
:ok
|
||||||
|
end
|
||||||
|
|
||||||
test "sets a negative cache entry for an error" do
|
test "sets a negative cache entry for an error" do
|
||||||
url = "https://bad.example.com/"
|
url = "https://bad.example.com/"
|
||||||
|
|
@ -23,4 +33,139 @@ defmodule Pleroma.Web.RichMedia.BackfillTest do
|
||||||
|
|
||||||
Backfill.run(%{"url" => url})
|
Backfill.run(%{"url" => url})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "sets a warm_cache entry" do
|
||||||
|
url = "https://good.example.com/"
|
||||||
|
url_hash = Card.url_to_hash(url)
|
||||||
|
|
||||||
|
Tesla.Mock.mock(fn %{url: ^url} ->
|
||||||
|
{:ok,
|
||||||
|
%Tesla.Env{
|
||||||
|
status: 200,
|
||||||
|
body: "<head><meta name=\"twitter:title\" content=\"Cofe\"></head>"
|
||||||
|
}}
|
||||||
|
end)
|
||||||
|
|
||||||
|
Pleroma.CachexMock
|
||||||
|
|> expect(:put, fn :rich_media_cache,
|
||||||
|
^url_hash,
|
||||||
|
%Pleroma.Web.RichMedia.Card{url_hash: ^url_hash} ->
|
||||||
|
{:ok, true}
|
||||||
|
end)
|
||||||
|
|
||||||
|
Backfill.run(%{"url" => url})
|
||||||
|
end
|
||||||
|
|
||||||
|
test "streams out update when stream == true" do
|
||||||
|
url = "https://example.com"
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
Tesla.Mock.mock(fn %{url: ^url} ->
|
||||||
|
{:ok,
|
||||||
|
%Tesla.Env{
|
||||||
|
status: 200,
|
||||||
|
body: "<head><meta name=\"twitter:title\" content=\"Cofe\"></head>"
|
||||||
|
}}
|
||||||
|
end)
|
||||||
|
|
||||||
|
{:ok, activity} = CommonAPI.post(user, %{status: "#cofe #{url}"})
|
||||||
|
|
||||||
|
Pleroma.CachexMock
|
||||||
|
|> expect(:put, fn :rich_media_cache, _, _ -> {:ok, true} end)
|
||||||
|
|
||||||
|
Pleroma.Web.ActivityPub.ActivityPubMock
|
||||||
|
|> expect(:stream_out, fn %Pleroma.Activity{id: id} ->
|
||||||
|
assert id == activity.id
|
||||||
|
:ok
|
||||||
|
end)
|
||||||
|
|
||||||
|
Backfill.run(%{"url" => url, "activity_id" => activity.id, "stream" => true})
|
||||||
|
end
|
||||||
|
|
||||||
|
test "does not stream out update when stream == false" do
|
||||||
|
url = "https://example.com"
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
Tesla.Mock.mock(fn %{url: ^url} ->
|
||||||
|
{:ok,
|
||||||
|
%Tesla.Env{
|
||||||
|
status: 200,
|
||||||
|
body: "<head><meta name=\"twitter:title\" content=\"Cofe\"></head>"
|
||||||
|
}}
|
||||||
|
end)
|
||||||
|
|
||||||
|
{:ok, activity} = CommonAPI.post(user, %{status: "#cofe #{url}"})
|
||||||
|
|
||||||
|
Pleroma.CachexMock
|
||||||
|
|> expect(:put, fn :rich_media_cache, _, _ -> {:ok, true} end)
|
||||||
|
|
||||||
|
Pleroma.Web.ActivityPub.ActivityPubMock
|
||||||
|
|> deny(:stream_out, 1)
|
||||||
|
|
||||||
|
Backfill.run(%{"url" => url, "activity_id" => "#{activity.data["id"]}", "stream" => false})
|
||||||
|
end
|
||||||
|
|
||||||
|
# NOTE: Below two MastoAPI tests cover almost the same code paths.
|
||||||
|
# index.json will always prefetch rich media, while show.json will try to get the card and
|
||||||
|
# fetch it when it isn't cached (both use Card.get_by_activity in the end).
|
||||||
|
# So if index.json doesn't fetch the rich media, show.json will when it renders the post,
|
||||||
|
# hence why index.json test will only call ActivityPub.stream_out twice,
|
||||||
|
# if streaming is re-enabled for in both.
|
||||||
|
test "does not stream out in MastoAPI StatusView index" do
|
||||||
|
url = "https://example.com"
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
Tesla.Mock.mock(fn %{url: ^url} ->
|
||||||
|
{:ok,
|
||||||
|
%Tesla.Env{
|
||||||
|
status: 200,
|
||||||
|
body: "<head><meta name=\"twitter:title\" content=\"Cofe\"></head>"
|
||||||
|
}}
|
||||||
|
end)
|
||||||
|
|
||||||
|
# CommonAPI federation processing will stream out once as a new post
|
||||||
|
Pleroma.Web.ActivityPub.ActivityPubMock
|
||||||
|
|> expect(:stream_out, 1, fn _ -> :ok end)
|
||||||
|
|
||||||
|
{:ok, activity} = CommonAPI.post(user, %{status: "#cofe #{url}"})
|
||||||
|
ObanHelpers.perform_all()
|
||||||
|
|
||||||
|
# Clear cache to force backfill below
|
||||||
|
Pleroma.Activity.HTML.invalidate_cache_for(activity.id)
|
||||||
|
Pleroma.Web.RichMedia.Card.delete(url)
|
||||||
|
|
||||||
|
Pleroma.Web.MastodonAPI.StatusView.render("index.json", %{
|
||||||
|
activities: [activity],
|
||||||
|
as: :activity
|
||||||
|
})
|
||||||
|
|
||||||
|
ObanHelpers.perform_all()
|
||||||
|
end
|
||||||
|
|
||||||
|
test "does not stream out in MastoAPI StatusView show" do
|
||||||
|
url = "https://example.com"
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
Tesla.Mock.mock(fn %{url: ^url} ->
|
||||||
|
{:ok,
|
||||||
|
%Tesla.Env{
|
||||||
|
status: 200,
|
||||||
|
body: "<head><meta name=\"twitter:title\" content=\"Cofe\"></head>"
|
||||||
|
}}
|
||||||
|
end)
|
||||||
|
|
||||||
|
# CommonAPI federation processing will stream out once as a new post
|
||||||
|
Pleroma.Web.ActivityPub.ActivityPubMock
|
||||||
|
|> expect(:stream_out, 1, fn _ -> :ok end)
|
||||||
|
|
||||||
|
{:ok, activity} = CommonAPI.post(user, %{status: "#cofe #{url}"})
|
||||||
|
ObanHelpers.perform_all()
|
||||||
|
|
||||||
|
# Clear cache to force backfill below
|
||||||
|
Pleroma.Activity.HTML.invalidate_cache_for(activity.id)
|
||||||
|
Pleroma.Web.RichMedia.Card.delete(url)
|
||||||
|
|
||||||
|
Pleroma.Web.MastodonAPI.StatusView.render("show.json", activity: activity)
|
||||||
|
ObanHelpers.perform_all()
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue