[#534] Initial implementation of unreachable federation targets retirement.
This commit is contained in:
parent
4a278cd80a
commit
f161a92cb1
6 changed files with 153 additions and 14 deletions
|
|
@ -3,7 +3,7 @@
|
|||
# SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
||||
alias Pleroma.{Activity, Repo, Object, Upload, User, Notification}
|
||||
alias Pleroma.{Activity, Repo, Object, Upload, User, Notification, Instances}
|
||||
alias Pleroma.Web.ActivityPub.{Transmogrifier, MRF}
|
||||
alias Pleroma.Web.WebFinger
|
||||
alias Pleroma.Web.Federator
|
||||
|
|
@ -721,7 +721,15 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
|||
end)
|
||||
end
|
||||
|
||||
def publish_one(%{inbox: inbox, json: json, actor: actor, id: id}) do
|
||||
def publish_one(%{inbox: inbox} = activity) do
|
||||
if Instances.reachable?(inbox) do
|
||||
do_publish_one(activity)
|
||||
else
|
||||
{:error, :noop}
|
||||
end
|
||||
end
|
||||
|
||||
defp do_publish_one(%{inbox: inbox, json: json, actor: actor, id: id}) do
|
||||
Logger.info("Federating #{id} to #{inbox}")
|
||||
host = URI.parse(inbox).host
|
||||
|
||||
|
|
@ -734,15 +742,24 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
|||
digest: digest
|
||||
})
|
||||
|
||||
@httpoison.post(
|
||||
inbox,
|
||||
json,
|
||||
[
|
||||
{"Content-Type", "application/activity+json"},
|
||||
{"signature", signature},
|
||||
{"digest", digest}
|
||||
]
|
||||
)
|
||||
with {:ok, _} <-
|
||||
result =
|
||||
@httpoison.post(
|
||||
inbox,
|
||||
json,
|
||||
[
|
||||
{"Content-Type", "application/activity+json"},
|
||||
{"signature", signature},
|
||||
{"digest", digest}
|
||||
]
|
||||
) do
|
||||
Instances.set_reachable(inbox)
|
||||
result
|
||||
else
|
||||
e ->
|
||||
Instances.set_unreachable(inbox)
|
||||
e
|
||||
end
|
||||
end
|
||||
|
||||
# TODO:
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ defmodule Pleroma.Web.Salmon do
|
|||
@httpoison Application.get_env(:pleroma, :httpoison)
|
||||
|
||||
use Bitwise
|
||||
alias Pleroma.Instances
|
||||
alias Pleroma.Web.XML
|
||||
alias Pleroma.Web.OStatus.ActivityRepresenter
|
||||
alias Pleroma.User
|
||||
|
|
@ -167,15 +168,23 @@ defmodule Pleroma.Web.Salmon do
|
|||
do: send_to_user(salmon, feed, poster)
|
||||
|
||||
defp send_to_user(url, feed, poster) when is_binary(url) do
|
||||
with {:ok, %{status: code}} <-
|
||||
with {:reachable, true} <- {:reachable, Instances.reachable?(url)},
|
||||
{:ok, %{status: code}} <-
|
||||
poster.(
|
||||
url,
|
||||
feed,
|
||||
[{"Content-Type", "application/magic-envelope+xml"}]
|
||||
) do
|
||||
Instances.set_reachable(url)
|
||||
Logger.debug(fn -> "Pushed to #{url}, code #{code}" end)
|
||||
else
|
||||
e -> Logger.debug(fn -> "Pushing Salmon to #{url} failed, #{inspect(e)}" end)
|
||||
{:reachable, false} ->
|
||||
Logger.debug(fn -> "Pushing Salmon to #{url} skipped as marked unreachable)" end)
|
||||
:noop
|
||||
|
||||
e ->
|
||||
Instances.set_unreachable(url)
|
||||
Logger.debug(fn -> "Pushing Salmon to #{url} failed, #{inspect(e)}" end)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
defmodule Pleroma.Web.Websub do
|
||||
alias Ecto.Changeset
|
||||
alias Pleroma.Repo
|
||||
alias Pleroma.Instances
|
||||
alias Pleroma.Web.Websub.{WebsubServerSubscription, WebsubClientSubscription}
|
||||
alias Pleroma.Web.OStatus.FeedRepresenter
|
||||
alias Pleroma.Web.{XML, Endpoint, OStatus}
|
||||
|
|
@ -267,7 +268,8 @@ defmodule Pleroma.Web.Websub do
|
|||
signature = sign(secret || "", xml)
|
||||
Logger.info(fn -> "Pushing #{topic} to #{callback}" end)
|
||||
|
||||
with {:ok, %{status: code}} <-
|
||||
with {:reachable, true} <- {:reachable, Instances.reachable?(callback)},
|
||||
{:ok, %{status: code}} <-
|
||||
@httpoison.post(
|
||||
callback,
|
||||
xml,
|
||||
|
|
@ -276,10 +278,16 @@ defmodule Pleroma.Web.Websub do
|
|||
{"X-Hub-Signature", "sha1=#{signature}"}
|
||||
]
|
||||
) do
|
||||
Instances.set_reachable(callback)
|
||||
Logger.info(fn -> "Pushed to #{callback}, code #{code}" end)
|
||||
{:ok, code}
|
||||
else
|
||||
{:reachable, false} ->
|
||||
Logger.debug(fn -> "Pushing to #{callback} skipped as marked unreachable)" end)
|
||||
{:error, :noop}
|
||||
|
||||
e ->
|
||||
Instances.set_unreachable(callback)
|
||||
Logger.debug(fn -> "Couldn't push to #{callback}, #{inspect(e)}" end)
|
||||
{:error, e}
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue