limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

Correct behaviour of mediaproxy blocklist

Browse source
This commit is contained in:
FloatingGhost 2023-07-17 18:17:04 +01:00
parent 8fe29bf5d2
commit c8904f15a2
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/pleroma/web/media_proxy.ex
View file

@ -84,8 +84,13 @@ defmodule Pleroma.Web.MediaProxy do
end end
def blocked?(url) do def blocked?(url) do
%{host: domain} = URI.parse(url) %{scheme: scheme, host: domain} = URI.parse(url)
domain in Config.get([:media_proxy, :whitelist]) # Block either the bare domain or the scheme-domain combo
scheme_domain = "#{scheme}://#{domain}"
blocklist = Config.get([:media_proxy, :blocklist])
Enum.member?(blocklist, domain) ||
Enum.member?(blocklist, scheme_domain)
end end
defp maybe_get_domain_from_url("http" <> _ = url) do defp maybe_get_domain_from_url("http" <> _ = url) do