Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whiteliste...

diff --git a/lib/pleroma/web/media_proxy.ex b/lib/pleroma/web/media_proxy.ex
index cbe7175848deb5d3fc4ee2dddedd5ce42de4bf01..1dab35d2ca952d749e0ccf866d8a295cd90b2369 100644 (file)
--- a/lib/pleroma/web/media_proxy.ex
+++ b/lib/pleroma/web/media_proxy.ex
@@ -69,24 +69,24 @@ defmodule Pleroma.Web.MediaProxy do
   #   non-local non-whitelisted URLs through it and be sure that body size constraint is preserved.
   def preview_enabled?, do: enabled?() and !!Config.get([:media_preview_proxy, :enabled])
 
-  def local?(url), do: String.starts_with?(url, Upload.base_url())
+  def local?(url), do: String.starts_with?(url, Web.base_url())
 
   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()
       |> Enum.map(&maybe_get_domain_from_url/1)
 
-    whitelist_domains = base_url = Upload.base_url()
-
-    if Web.base_url() == base_url do
-      mediaproxy_whitelist_domains
-    else
-      %{host: base_domain} = URI.parse(base_url)
-      [base_domain | mediaproxy_whitelist_domains]
-    end
+    whitelist_domains =
+      if web_domain == upload_domain do
+        mediaproxy_whitelist_domains
+      else
+        [upload_domain | mediaproxy_whitelist_domains]
+      end
 
     domain in whitelist_domains
   end