X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmedia_proxy.ex;h=27f3371389edbb5178e5b6435f746b2d19c65be6;hb=875fbaae35fe73f01d7fd55c255043dda929e365;hp=1dab35d2ca952d749e0ccf866d8a295cd90b2369;hpb=10408810473ad211423cae49db94c33a765dbe33;p=akkoma
diff --git a/lib/pleroma/web/media_proxy.ex b/lib/pleroma/web/media_proxy.ex
index 1dab35d2c..27f337138 100644
--- a/lib/pleroma/web/media_proxy.ex
+++ b/lib/pleroma/web/media_proxy.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors
+# Copyright © 2017-2021 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MediaProxy do
@@ -73,22 +73,14 @@ defmodule Pleroma.Web.MediaProxy do
def whitelisted?(url) do
%{host: domain} = URI.parse(url)
- %{host: web_domain} = Web.base_url() |> URI.parse()
- %{host: upload_domain} = Upload.base_url() |> URI.parse()
mediaproxy_whitelist_domains =
[:media_proxy, :whitelist]
|> Config.get()
+ |> Kernel.++(["#{Upload.base_url()}"])
|> Enum.map(&maybe_get_domain_from_url/1)
- whitelist_domains =
- if web_domain == upload_domain do
- mediaproxy_whitelist_domains
- else
- [upload_domain | mediaproxy_whitelist_domains]
- end
-
- domain in whitelist_domains
+ domain in mediaproxy_whitelist_domains
end
defp maybe_get_domain_from_url("http" <> _ = url) do