diff options
| author | kaniini <nenolod@gmail.com> | 2018-11-20 18:09:46 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-11-20 18:09:46 +0000 |
| commit | dbb483659a317b3b48873cd510d0cbcf5ba03738 (patch) | |
| tree | 7f4a11e221cdc09aa62ff0a717356bbe0d64e59e /lib | |
| parent | fbc3f2893a3fa9177a73af15c36beb46eaa2707c (diff) | |
| parent | 7f4c3a1e993a3827b58f9cb8049a8ee5f54a1bdf (diff) | |
| download | pleroma-dbb483659a317b3b48873cd510d0cbcf5ba03738.tar.gz pleroma-dbb483659a317b3b48873cd510d0cbcf5ba03738.zip | |
Merge branch 'fix/mediaproxy-empty-url' into 'develop'
mediaproxy: fix empty url & add some tests
See merge request pleroma/pleroma!466
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/media_proxy/media_proxy.ex | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/web/media_proxy/media_proxy.ex b/lib/pleroma/web/media_proxy/media_proxy.ex index 93c36b4ed..0fc0a07b2 100644 --- a/lib/pleroma/web/media_proxy/media_proxy.ex +++ b/lib/pleroma/web/media_proxy/media_proxy.ex @@ -3,6 +3,8 @@ defmodule Pleroma.Web.MediaProxy do def url(nil), do: nil + def url(""), do: nil + def url(url = "/" <> _), do: url def url(url) do @@ -15,10 +17,10 @@ defmodule Pleroma.Web.MediaProxy do base64 = Base.url_encode64(url, @base64_opts) sig = :crypto.hmac(:sha, secret, base64) sig64 = sig |> Base.url_encode64(@base64_opts) - filename = Path.basename(URI.parse(url).path) + filename = if path = URI.parse(url).path, do: "/" <> Path.basename(path), else: "" Keyword.get(config, :base_url, Pleroma.Web.base_url()) <> - "/proxy/#{sig64}/#{base64}/#{filename}" + "/proxy/#{sig64}/#{base64}#{filename}" end end |