Switch from serving a 400 to a 302

2 files changed, 30 insertions, 4 deletions

diff --git a/lib/pleroma/web/media_proxy/media_proxy_controller.ex b/lib/pleroma/web/media_proxy/media_proxy_controller.ex
index 767496b68..20f3a3438 100644
--- a/lib/pleroma/web/media_proxy/media_proxy_controller.ex
+++ b/lib/pleroma/web/media_proxy/media_proxy_controller.ex
@@ -207,12 +207,25 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
   end
 
   defp validate_host(conn, _params) do
-    proxy_host = MediaProxy.base_url() |> URI.parse() |> Map.get(:host)
+    %{scheme: proxy_scheme, host: proxy_host, port: proxy_port} =
+      MediaProxy.base_url() |> URI.parse()
 
     if match?(^proxy_host, conn.host) do
       conn
     else
-      send_resp(conn, 400, Conn.Status.reason_phrase(400))
+      redirect_url =
+        %URI{
+          scheme: proxy_scheme,
+          host: proxy_host,
+          port: proxy_port,
+          path: conn.request_path,
+          query: conn.query_string
+        }
+        |> URI.to_string()
+        |> String.trim_trailing("?")
+
+      conn
+      |> Phoenix.Controller.redirect(external: redirect_url)
       |> halt()
     end
   end
diff --git a/lib/pleroma/web/plugs/uploaded_media.ex b/lib/pleroma/web/plugs/uploaded_media.ex
index f97c64cee..9dd5eb239 100644
--- a/lib/pleroma/web/plugs/uploaded_media.ex
+++ b/lib/pleroma/web/plugs/uploaded_media.ex
@@ -46,7 +46,8 @@ defmodule Pleroma.Web.Plugs.UploadedMedia do
 
     config = Pleroma.Config.get(Pleroma.Upload)
 
-    media_host = Pleroma.Upload.base_url() |> URI.parse() |> Map.get(:host)
+    %{scheme: media_scheme, host: media_host, port: media_port} =
+      Pleroma.Upload.base_url() |> URI.parse()
 
     with {:valid_host, true} <- {:valid_host, match?(^media_host, conn.host)},
          uploader <- Keyword.fetch!(config, :uploader),
@@ -56,7 +57,19 @@ defmodule Pleroma.Web.Plugs.UploadedMedia do
       get_media(conn, get_method, proxy_remote, opts)
     else
       {:valid_host, false} ->
-        send_resp(conn, 400, Plug.Conn.Status.reason_phrase(400))
+        redirect_url =
+          %URI{
+            scheme: media_scheme,
+            host: media_host,
+            port: media_port,
+            path: conn.request_path,
+            query: conn.query_string
+          }
+          |> URI.to_string()
+          |> String.trim_trailing("?")
+
+        conn
+        |> Phoenix.Controller.redirect(external: redirect_url)
         |> halt()
 
       _ ->