X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmedia_proxy%2Fmedia_proxy.ex;h=37718f48bb677e07f236d6946581071da4617cee;hb=07fdc072382007812dc6af80fa2912f6b6d987b8;hp=9c1d717481d2ec7dde07ad50d3e87e515a878673;hpb=5f35fdcf5d7bc0dc6054eda06d565268f9e79b33;p=akkoma

diff --git a/lib/pleroma/web/media_proxy/media_proxy.ex b/lib/pleroma/web/media_proxy/media_proxy.ex
index 9c1d71748..37718f48b 100644
--- a/lib/pleroma/web/media_proxy/media_proxy.ex
+++ b/lib/pleroma/web/media_proxy/media_proxy.ex
@@ -1,33 +1,33 @@
 defmodule Pleroma.Web.MediaProxy do
   @base64_opts [padding: false]
-  @base64_key Application.get_env(:pleroma, Pleroma.Web.Endpoint)[:secret_key_base]
 
   def url(nil), do: nil
 
+  def url(url = "/" <> _), do: url
+
   def url(url) do
-    if String.starts_with?(url, Pleroma.Web.base_url) do
+    config = Application.get_env(:pleroma, :media_proxy, [])
+
+    if !Keyword.get(config, :enabled, false) or String.starts_with?(url, Pleroma.Web.base_url()) do
       url
     else
+      secret = Application.get_env(:pleroma, Pleroma.Web.Endpoint)[:secret_key_base]
       base64 = Base.url_encode64(url, @base64_opts)
-      sig = :crypto.hmac(:sha, @base64_key, base64)
+      sig = :crypto.hmac(:sha, secret, base64)
       sig64 = sig |> Base.url_encode64(@base64_opts)
-      cache_url("#{sig64}/#{base64}")
+      Keyword.get(config, :base_url, Pleroma.Web.base_url()) <> "/proxy/#{sig64}/#{base64}"
     end
   end
 
   def decode_url(sig, url) do
+    secret = Application.get_env(:pleroma, Pleroma.Web.Endpoint)[:secret_key_base]
     sig = Base.url_decode64!(sig, @base64_opts)
-    local_sig = :crypto.hmac(:sha, @base64_key, url)
+    local_sig = :crypto.hmac(:sha, secret, url)
+
     if local_sig == sig do
       {:ok, Base.url_decode64!(url, @base64_opts)}
     else
       {:error, :invalid_signature}
     end
   end
-
-  defp cache_url(path) do
-    "/proxy/" <> path
-  end
-
-
 end