summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrinpatch <rin@patch.cx>2021-03-19 08:52:12 +0000
committerrinpatch <rin@patch.cx>2021-03-19 08:52:12 +0000
commita9bc652ab9f4880566a823d3d67fe0247f7954f4 (patch)
treeeb55a48d4de3bf4808122a3635da3b2554202255 /lib
parentf930e83fa2a7e2184ca6bd09773d81568e7c755c (diff)
parenteaaa20e0f1ac56fee0a8a0eb6a21bc7bf11dbe48 (diff)
downloadpleroma-a9bc652ab9f4880566a823d3d67fe0247f7954f4.tar.gz
pleroma-a9bc652ab9f4880566a823d3d67fe0247f7954f4.zip
Merge branch 'mediaproxy-decode' into 'develop'
Simple way to decode mediaproxy URLs See merge request pleroma/pleroma!3364
Diffstat (limited to 'lib')
-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