pleroma

commit: 48e490cd585dd20922a667ef8573ce52154adeea
parent 043a00991dec09f5804df1db1fdc1b1179843453
Author: tusooa <tusooa@kazv.moe>
Date:   Sat,  1 Jul 2023 21:54:18 +0000

Merge branch 'bugfix/full-revert-media-host-validation' into 'develop'

Merge Revert "Merge branch 'validate-host' into 'develop'"

Closes #3136

See merge request pleroma/pleroma!3909
Diffstat:
D
changelog.d/3896.add
1
-
A
changelog.d/3909.skip
0

M
lib/pleroma/web/plugs/uploaded_media.ex
22
+---------------------
M
test/pleroma/web/plugs/uploaded_media_plug_test.exs
26
--------------------------

4 files changed, 1 insertion(+), 48 deletions(-)
diff --git a/changelog.d/3896.add b/changelog.d/3896.add
@@ -1 +0,0 @@
-Validate Host header for Uploads and return a 302 if the base_url has changed
diff --git a/changelog.d/3909.skip b/changelog.d/3909.skip
diff --git a/lib/pleroma/web/plugs/uploaded_media.ex b/lib/pleroma/web/plugs/uploaded_media.ex
@@ -46,32 +46,12 @@ defmodule Pleroma.Web.Plugs.UploadedMedia do
 
     config = Pleroma.Config.get(Pleroma.Upload)
 
-    %{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),
+    with uploader <- Keyword.fetch!(config, :uploader),
          proxy_remote = Keyword.get(config, :proxy_remote, false),
          {:ok, get_method} <- uploader.get_file(file),
          false <- media_is_banned(conn, get_method) do
       get_media(conn, get_method, proxy_remote, opts)
     else
-      {:valid_host, false} ->
-        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()
-
       _ ->
         conn
         |> send_resp(:internal_server_error, dgettext("errors", "Failed"))
diff --git a/test/pleroma/web/plugs/uploaded_media_plug_test.exs b/test/pleroma/web/plugs/uploaded_media_plug_test.exs
@@ -40,30 +40,4 @@ defmodule Pleroma.Web.Plugs.UploadedMediaPlugTest do
              &(&1 == {"content-disposition", ~s[inline; filename="\\"cofe\\".gif"]})
            )
   end
-
-  test "denies access to media if wrong Host", %{
-    attachment_url: attachment_url
-  } do
-    conn = get(build_conn(), attachment_url)
-
-    assert conn.status == 200
-
-    new_media_base = "http://media.localhost:8080"
-
-    %{scheme: new_media_scheme, host: new_media_host, port: new_media_port} =
-      URI.parse(new_media_base)
-
-    clear_config([Pleroma.Upload, :base_url], new_media_base)
-
-    conn = get(build_conn(), attachment_url)
-
-    expected_url =
-      URI.parse(attachment_url)
-      |> Map.put(:host, new_media_host)
-      |> Map.put(:port, new_media_port)
-      |> Map.put(:scheme, new_media_scheme)
-      |> URI.to_string()
-
-    assert redirected_to(conn, 302) == expected_url
-  end
 end