Merge branch 'fix/mediaproxy-s3' into 'develop'
Fix S3 links encoding in Mediaproxy Closes #580 See merge request pleroma/pleroma!828
This commit is contained in:
commit
1d17082ab2
|
@ -19,11 +19,16 @@ def url(url) do
|
||||||
else
|
else
|
||||||
secret = Application.get_env(:pleroma, Pleroma.Web.Endpoint)[:secret_key_base]
|
secret = Application.get_env(:pleroma, Pleroma.Web.Endpoint)[:secret_key_base]
|
||||||
|
|
||||||
|
# Must preserve `%2F` for compatibility with S3 (https://git.pleroma.social/pleroma/pleroma/issues/580)
|
||||||
|
replacement = get_replacement(url, ":2F:")
|
||||||
|
|
||||||
# The URL is url-decoded and encoded again to ensure it is correctly encoded and not twice.
|
# The URL is url-decoded and encoded again to ensure it is correctly encoded and not twice.
|
||||||
base64 =
|
base64 =
|
||||||
url
|
url
|
||||||
|
|> String.replace("%2F", replacement)
|
||||||
|> URI.decode()
|
|> URI.decode()
|
||||||
|> URI.encode()
|
|> URI.encode()
|
||||||
|
|> String.replace(replacement, "%2F")
|
||||||
|> Base.url_encode64(@base64_opts)
|
|> Base.url_encode64(@base64_opts)
|
||||||
|
|
||||||
sig = :crypto.hmac(:sha, secret, base64)
|
sig = :crypto.hmac(:sha, secret, base64)
|
||||||
|
@ -60,4 +65,12 @@ def build_url(sig_base64, url_base64, filename \\ nil) do
|
||||||
|> Enum.filter(fn value -> value end)
|
|> Enum.filter(fn value -> value end)
|
||||||
|> Path.join()
|
|> Path.join()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp get_replacement(url, replacement) do
|
||||||
|
if String.contains?(url, replacement) do
|
||||||
|
get_replacement(url, replacement <> replacement)
|
||||||
|
else
|
||||||
|
replacement
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -140,6 +140,15 @@ test "uses the configured base_url" do
|
||||||
|
|
||||||
assert String.starts_with?(encoded, Pleroma.Config.get([:media_proxy, :base_url]))
|
assert String.starts_with?(encoded, Pleroma.Config.get([:media_proxy, :base_url]))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# https://git.pleroma.social/pleroma/pleroma/issues/580
|
||||||
|
test "encoding S3 links (must preserve `%2F`)" do
|
||||||
|
url =
|
||||||
|
"https://s3.amazonaws.com/example/test.png?X-Amz-Credential=your-access-key-id%2F20130721%2Fus-east-1%2Fs3%2Faws4_request"
|
||||||
|
|
||||||
|
encoded = url(url)
|
||||||
|
assert decode_result(encoded) == url
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "when disabled" do
|
describe "when disabled" do
|
||||||
|
|
Loading…
Reference in New Issue