summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@feld.me>2023-12-06 13:52:41 -0500
committerMark Felder <feld@feld.me>2023-12-06 13:52:41 -0500
commit664ce0a1c35983a4f871557b392e149d50bfcf6b (patch)
treefaf5ae9f516767dd38eef56059358f9e09c2b4be
parent3a9dc3d28c6c6f843f9be4acc0d98bc98a8ba868 (diff)
Disable the POST /relay/inbox -or- POST /internal/fetch/inbox to ensure all the inbox request hit our function that jams it into Obaninbox-latency
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub_controller.ex39
1 files changed, 20 insertions, 19 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 11cce44de..129889f27 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -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