squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify. We will always have a result from Upload.base_url/0, so just add it to the list

Browse Source
This commit is contained in:
Mark Felder 2021-01-11 14:19:14 -06:00
parent 1040881047
commit ef59d99833
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/pleroma/web/media_proxy.ex
View File

@ -73,22 +73,14 @@ defmodule Pleroma.Web.MediaProxy do
def whitelisted?(url) do def whitelisted?(url) do
%{host: domain} = URI.parse(url) %{host: domain} = URI.parse(url)
%{host: web_domain} = Web.base_url() |> URI.parse()
%{host: upload_domain} = Upload.base_url() |> URI.parse()
mediaproxy_whitelist_domains = mediaproxy_whitelist_domains =
[:media_proxy, :whitelist] [:media_proxy, :whitelist]
|> Config.get() |> Config.get()
|> Kernel.++(["#{Upload.base_url()}"])
|> Enum.map(&maybe_get_domain_from_url/1) |> Enum.map(&maybe_get_domain_from_url/1)
whitelist_domains = domain in mediaproxy_whitelist_domains
if web_domain == upload_domain do
mediaproxy_whitelist_domains
else
[upload_domain | mediaproxy_whitelist_domains]
end
domain in whitelist_domains
end end
defp maybe_get_domain_from_url("http" <> _ = url) do defp maybe_get_domain_from_url("http" <> _ = url) do