Merge branch 'release/2.2.0' into 'stable'v2.2.0

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

1 files changed, 0 insertions, 127 deletions

diff --git a/lib/pleroma/web/media_proxy/media_proxy.ex b/lib/pleroma/web/media_proxy/media_proxy.ex
deleted file mode 100644
index e18dd8224..000000000
--- a/lib/pleroma/web/media_proxy/media_proxy.ex
+++ /dev/null
@@ -1,127 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.MediaProxy do
-  alias Pleroma.Config
-  alias Pleroma.Upload
-  alias Pleroma.Web
-  alias Pleroma.Web.MediaProxy.Invalidation
-
-  @base64_opts [padding: false]
-  @cache_table :banned_urls_cache
-
-  def cache_table, do: @cache_table
-
-  @spec in_banned_urls(String.t()) :: boolean()
-  def in_banned_urls(url), do: elem(Cachex.exists?(@cache_table, url(url)), 1)
-
-  def remove_from_banned_urls(urls) when is_list(urls) do
-    Cachex.execute!(@cache_table, fn cache ->
-      Enum.each(Invalidation.prepare_urls(urls), &Cachex.del(cache, &1))
-    end)
-  end
-
-  def remove_from_banned_urls(url) when is_binary(url) do
-    Cachex.del(@cache_table, url(url))
-  end
-
-  def put_in_banned_urls(urls) when is_list(urls) do
-    Cachex.execute!(@cache_table, fn cache ->
-      Enum.each(Invalidation.prepare_urls(urls), &Cachex.put(cache, &1, true))
-    end)
-  end
-
-  def put_in_banned_urls(url) when is_binary(url) do
-    Cachex.put(@cache_table, url(url), true)
-  end
-
-  def url(url) when is_nil(url) or url == "", do: nil
-  def url("/" <> _ = url), do: url
-
-  def url(url) do
-    if disabled?() or not url_proxiable?(url) do
-      url
-    else
-      encode_url(url)
-    end
-  end
-
-  @spec url_proxiable?(String.t()) :: boolean()
-  def url_proxiable?(url) do
-    if local?(url) or whitelisted?(url) do
-      false
-    else
-      true
-    end
-  end
-
-  defp disabled?, do: !Config.get([:media_proxy, :enabled], false)
-
-  defp local?(url), do: String.starts_with?(url, Pleroma.Web.base_url())
-
-  defp whitelisted?(url) do
-    %{host: domain} = URI.parse(url)
-
-    mediaproxy_whitelist_domains =
-      [:media_proxy, :whitelist]
-      |> Config.get()
-      |> Enum.map(&maybe_get_domain_from_url/1)
-
-    whitelist_domains =
-      if base_url = Config.get([Upload, :base_url]) do
-        %{host: base_domain} = URI.parse(base_url)
-        [base_domain | mediaproxy_whitelist_domains]
-      else
-        mediaproxy_whitelist_domains
-      end
-
-    domain in whitelist_domains
-  end
-
-  defp maybe_get_domain_from_url("http" <> _ = url) do
-    URI.parse(url).host
-  end
-
-  defp maybe_get_domain_from_url(domain), do: domain
-
-  def encode_url(url) do
-    base64 = Base.url_encode64(url, @base64_opts)
-
-    sig64 =
-      base64
-      |> signed_url
-      |> Base.url_encode64(@base64_opts)
-
-    build_url(sig64, base64, filename(url))
-  end
-
-  def decode_url(sig, url) do
-    with {:ok, sig} <- Base.url_decode64(sig, @base64_opts),
-         signature when signature == sig <- signed_url(url) do
-      {:ok, Base.url_decode64!(url, @base64_opts)}
-    else
-      _ -> {:error, :invalid_signature}
-    end
-  end
-
-  defp signed_url(url) do
-    :crypto.hmac(:sha, Config.get([Web.Endpoint, :secret_key_base]), url)
-  end
-
-  def filename(url_or_path) do
-    if path = URI.parse(url_or_path).path, do: Path.basename(path)
-  end
-
-  def build_url(sig_base64, url_base64, filename \\ nil) do
-    [
-      Config.get([:media_proxy, :base_url], Web.base_url()),
-      "proxy",
-      sig_base64,
-      url_base64,
-      filename
-    ]
-    |> Enum.filter(& &1)
-    |> Path.join()
-  end
-end