Validate Host header matches expected value before allowing access to Uploads
This commit is contained in:
parent
843fcca5b4
commit
a60dd0d92d
2 changed files with 24 additions and 1 deletions
|
@ -46,12 +46,21 @@ defmodule Pleroma.Web.Plugs.UploadedMedia do
|
||||||
|
|
||||||
config = Pleroma.Config.get(Pleroma.Upload)
|
config = Pleroma.Config.get(Pleroma.Upload)
|
||||||
|
|
||||||
with uploader <- Keyword.fetch!(config, :uploader),
|
media_host = Pleroma.Upload.base_url() |> URI.parse() |> Map.get(:host)
|
||||||
|
|
||||||
|
with {:valid_host, true} <- {:valid_host, match?(^media_host, conn.host)},
|
||||||
|
uploader <- Keyword.fetch!(config, :uploader),
|
||||||
proxy_remote = Keyword.get(config, :proxy_remote, false),
|
proxy_remote = Keyword.get(config, :proxy_remote, false),
|
||||||
{:ok, get_method} <- uploader.get_file(file),
|
{:ok, get_method} <- uploader.get_file(file),
|
||||||
false <- media_is_banned(conn, get_method) do
|
false <- media_is_banned(conn, get_method) do
|
||||||
get_media(conn, get_method, proxy_remote, opts)
|
get_media(conn, get_method, proxy_remote, opts)
|
||||||
else
|
else
|
||||||
|
{:valid_host, false} ->
|
||||||
|
conn
|
||||||
|
|
||||||
|
send_resp(conn, 400, Plug.Conn.Status.reason_phrase(400))
|
||||||
|
|> halt()
|
||||||
|
|
||||||
_ ->
|
_ ->
|
||||||
conn
|
conn
|
||||||
|> send_resp(:internal_server_error, dgettext("errors", "Failed"))
|
|> send_resp(:internal_server_error, dgettext("errors", "Failed"))
|
||||||
|
|
|
@ -40,4 +40,18 @@ defmodule Pleroma.Web.Plugs.UploadedMediaPlugTest do
|
||||||
&(&1 == {"content-disposition", ~s[inline; filename="\\"cofe\\".gif"]})
|
&(&1 == {"content-disposition", ~s[inline; filename="\\"cofe\\".gif"]})
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "denies access to media if wrong Host", %{
|
||||||
|
attachment_url: attachment_url
|
||||||
|
} do
|
||||||
|
conn = get(build_conn(), attachment_url)
|
||||||
|
|
||||||
|
assert conn.status == 200
|
||||||
|
|
||||||
|
clear_config([Pleroma.Upload, :base_url], "http://media.localhost/")
|
||||||
|
|
||||||
|
conn = get(build_conn(), attachment_url)
|
||||||
|
|
||||||
|
assert conn.status == 400
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue