Merge branch 'revert-mediaproxy-host-validation' into 'develop'
Revert MediaProxy Host header validation See merge request pleroma/pleroma!3902
This commit is contained in:
commit
75900f21f0
5 changed files with 2 additions and 59 deletions
|
|
@ -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;"}])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue