aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/media_proxy.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-05-19 13:39:29 -0500
committerAlex Gleason <alex@alexgleason.me>2021-05-19 13:39:29 -0500
commite343b46ea041ce6a542b23100df2e9c11e262c75 (patch)
tree7bd219409244d97e51ad58f800889c65f41837a0 /lib/pleroma/web/media_proxy.ex
parenta5bbebda588a54cb76d1a75239523db676980eb0 (diff)
parent8e9f032f25251d910b59c55226d10a305bad3cba (diff)
downloadpleroma-instance-view-recompilation.tar.gz
Merge remote-tracking branch 'pleroma/develop' into instance-view-recompilationinstance-view-recompilation
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 27f337138..d0d4bb4b3 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([Web.Endpoint, :secret_key_base]), url)
end