aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/media_proxy.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-06-01 15:55:05 -0500
committerAlex Gleason <alex@alexgleason.me>2021-06-01 15:55:05 -0500
commit9d89e1736a08d6c559355e52a996782994608cd4 (patch)
treecf34422a48ea0e6cad4299db7816b094512416fe /lib/pleroma/web/media_proxy.ex
parent9166ae1bcf8a8ec113bb21aab7effca5a14601ca (diff)
parent3fe6ada6fc6f42057cb346c04e4ecc9f35c0e5cb (diff)
downloadpleroma-cycles-config-url.tar.gz
Merge remote-tracking branch 'pleroma/develop' into cycles-config-urlcycles-config-url
Diffstat (limited to 'lib/pleroma/web/media_proxy.ex')
-rw-r--r--lib/pleroma/web/media_proxy.ex5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/pleroma/web/media_proxy.ex b/lib/pleroma/web/media_proxy.ex
index 7df591201..5c32078aa 100644
--- a/lib/pleroma/web/media_proxy.ex
+++ b/lib/pleroma/web/media_proxy.ex
@@ -121,6 +121,11 @@ defmodule Pleroma.Web.MediaProxy do
end
end
+ def decode_url(encoded) do
+ [_, "proxy", sig, base64 | _] = URI.parse(encoded).path |> String.split("/")
+ decode_url(sig, base64)
+ end
+
defp signed_url(url) do
:crypto.hmac(:sha, Config.get([Endpoint, :secret_key_base]), url)
end