mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-06-01 08:28:06 +00:00
Code Issues Projects Releases Wiki Activity

Disable the POST /relay/inbox -or- POST /internal/fetch/inbox to ensure all the inbox request hit our function that jams it into Oban

Browse source
This commit is contained in:
Mark Felder 2023-12-06 13:52:41 -05:00
parent 3a9dc3d28c
commit 664ce0a1c3
1 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lib/pleroma/web/activity_pub/activity_pub_controller.ex
View file

@ -272,16 +272,17 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
end
end
# POST /relay/inbox -or- POST /internal/fetch/inbox
def inbox(conn, %{"type" => "Create"} = params) do
if FederatingPlug.federating?() do
post_inbox_relayed_create(conn, params)
else
conn
|> put_status(:bad_request)
|> json("Not federating")
end
end
# Disable this for testing
# # POST /relay/inbox -or- POST /internal/fetch/inbox
# def inbox(conn, %{"type" => "Create"} = params) do
# if FederatingPlug.federating?() do
# post_inbox_relayed_create(conn, params)
# else
# conn
# |> put_status(:bad_request)
# |> json("Not federating")
# end
# end
def inbox(conn, _params) do
conn_data = %{params: conn.params, req_headers: conn.req_headers}
@ -297,15 +298,15 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
end
end
defp post_inbox_relayed_create(conn, params) do
Logger.debug(
"Signature missing or not from author, relayed Create message, fetching object from source"
)
Fetcher.fetch_object_from_id(params["object"]["id"])
json(conn, "ok")
end
# defp post_inbox_relayed_create(conn, params) do
# Logger.debug(
# "Signature missing or not from author, relayed Create message, fetching object from source"
# )
#
# Fetcher.fetch_object_from_id(params["object"]["id"])
#
# json(conn, "ok")
# end
defp represent_service_actor(%User{} = user, conn) do
conn