diff options
author | Mark Felder <feld@feld.me> | 2023-06-07 09:19:22 -0400 |
---|---|---|
committer | Mark Felder <feld@feld.me> | 2023-06-07 09:19:22 -0400 |
commit | fadcd7f1a9e41ec9b54f251cf782688bf3d36889 (patch) | |
tree | 39ac8410fcfda00a0ea97fbff0763e10255cc5e5 /lib | |
parent | 43458cb7a144f984d2d745e50b8a992c7482265c (diff) | |
download | pleroma-fadcd7f1a9e41ec9b54f251cf782688bf3d36889.tar.gz pleroma-fadcd7f1a9e41ec9b54f251cf782688bf3d36889.zip |
Revert MediaProxy Host header validation
Something is going wrong here even though the tests are correct.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/media_proxy/media_proxy_controller.ex | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/lib/pleroma/web/media_proxy/media_proxy_controller.ex b/lib/pleroma/web/media_proxy/media_proxy_controller.ex index 20f3a3438..bda5b36ed 100644 --- a/lib/pleroma/web/media_proxy/media_proxy_controller.ex +++ b/lib/pleroma/web/media_proxy/media_proxy_controller.ex @@ -12,7 +12,6 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do alias Pleroma.Web.MediaProxy alias Plug.Conn - plug(:validate_host) plug(:sandbox) def remote(conn, %{"sig" => sig64, "url" => url64}) do @@ -206,30 +205,6 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do Config.get([:media_proxy, :proxy_opts], []) end - defp validate_host(conn, _params) do - %{scheme: proxy_scheme, host: proxy_host, port: proxy_port} = - MediaProxy.base_url() |> URI.parse() - - if match?(^proxy_host, conn.host) do - conn - else - 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 - defp sandbox(conn, _params) do conn |> merge_resp_headers([{"content-security-policy", "sandbox;"}]) |