Revert MediaProxy Host header validation
Something is going wrong here even though the tests are correct.
This commit is contained in:
parent
43458cb7a1
commit
fadcd7f1a9
4 changed files with 2 additions and 59 deletions
|
|
@ -54,35 +54,6 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
|
|||
} = get(conn, "/proxy/hhgfh/eeee/fff")
|
||||
end
|
||||
|
||||
test "it returns a 302 for invalid host", %{conn: conn} do
|
||||
new_proxy_base = "http://mp.localhost/"
|
||||
|
||||
%{scheme: new_proxy_scheme, host: new_proxy_host, port: new_proxy_port} =
|
||||
URI.parse(new_proxy_base)
|
||||
|
||||
clear_config([:media_proxy, :base_url], new_proxy_base)
|
||||
|
||||
proxy_url =
|
||||
MediaProxy.encode_url("https://pleroma.social/logo.jpeg")
|
||||
|> URI.parse()
|
||||
|> Map.put(:host, "wronghost")
|
||||
|> URI.to_string()
|
||||
|
||||
expected_url =
|
||||
URI.parse(proxy_url)
|
||||
|> Map.put(:host, new_proxy_host)
|
||||
|> Map.put(:port, new_proxy_port)
|
||||
|> Map.put(:scheme, new_proxy_scheme)
|
||||
|> URI.to_string()
|
||||
|
||||
with_mock Pleroma.ReverseProxy,
|
||||
call: fn _conn, _url, _opts -> %Conn{status: :success} end do
|
||||
conn = get(conn, proxy_url)
|
||||
|
||||
assert redirected_to(conn, 302) == expected_url
|
||||
end
|
||||
end
|
||||
|
||||
test "redirects to valid url when filename is invalidated", %{conn: conn, url: url} do
|
||||
invalid_url = String.replace(url, "test.png", "test-file.png")
|
||||
response = get(conn, invalid_url)
|
||||
|
|
|
|||
|
|
@ -120,9 +120,6 @@ defmodule Pleroma.Web.ConnCase do
|
|||
|
||||
Mox.verify_on_exit!()
|
||||
|
||||
{:ok,
|
||||
conn:
|
||||
Phoenix.ConnTest.build_conn()
|
||||
|> Map.put(:host, Pleroma.Web.Endpoint.host())}
|
||||
{:ok, conn: Phoenix.ConnTest.build_conn()}
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue