Commit 109c4906 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch 's3-proxy-fails-on-nginx' into 'master'

S3 proxy fails on nginx

See merge request funkwhale/funkwhale!935
parents bd3a4b44 4a5484c7
......@@ -320,6 +320,10 @@ def get_file_path(audio_file):
)
path = "/music" + audio_file.replace(prefix, "", 1)
if path.startswith("http://") or path.startswith("https://"):
protocol, remainder = path.split("://", 1)
hostname, r_path = remainder.split("/", 1)
r_path = urllib.parse.quote(r_path)
path = protocol + "://" + hostname + "/" + r_path
return (settings.PROTECT_FILES_PATH + "/media/" + path).encode("utf-8")
# needed to serve files with % or ? chars
path = urllib.parse.quote(path)
......
......@@ -247,6 +247,18 @@ def test_serve_file_in_place_nginx_encode_url(
assert response["X-Accel-Redirect"] == expected
def test_serve_s3_nginx_encode_url(mocker, settings):
settings.PROTECT_FILE_PATH = "/_protected/media"
settings.REVERSE_PROXY_TYPE = "nginx"
audio_file = mocker.Mock(url="https://s3.storage.example/path/to/mp3?aws=signature")
expected = (
b"/_protected/media/https://s3.storage.example/path/to/mp3%3Faws%3Dsignature"
)
assert views.get_file_path(audio_file) == expected
@pytest.mark.parametrize(
"proxy,serve_path,expected",
[
......
Fix audio serving issues under S3/nginx when signatures are enabled
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment