fix: support static files with spaces in their names

Browser encodes all non-ASCII characters in URL into percent encoding format.

Static files are served from the filesystem, and can have unsafe characters
in their names.

To support such files the request `path` should be decoded.
This commit is contained in:
Andrew Grechkin 2024-12-06 17:13:26 +01:00
commit b3156107d7
No known key found for this signature in database
GPG key ID: FF125E23B3F82357
3 changed files with 10 additions and 2 deletions

View file

@ -2,7 +2,7 @@ import hashlib
import json
from datasette.utils import MultiParams, calculate_etag
from mimetypes import guess_type
from urllib.parse import parse_qs, urlunparse, parse_qsl
from urllib.parse import parse_qs, urlunparse, parse_qsl, unquote
from pathlib import Path
from http.cookies import SimpleCookie, Morsel
import aiofiles
@ -318,7 +318,7 @@ def asgi_static(root_path, chunk_size=4096, headers=None, content_type=None):
path = request.scope["url_route"]["kwargs"]["path"]
headers = static_headers.copy()
try:
full_path = (root_path / path).resolve().absolute()
full_path = (root_path / unquote(path)).resolve().absolute()
except FileNotFoundError:
await asgi_send_html(send, "404: Directory not found", 404)
return

View file

@ -116,6 +116,14 @@ def test_static_mounts():
) as client:
response = client.get("/custom-static/test_html.py")
assert response.status_code == 200
response = client.get(
"/custom-static/test_templates/pages/nested/filename with spaces"
)
assert response.status_code == 200
response = client.get(
"/custom-static/test_templates/pages/topic_{topic}/{slug}.html"
)
assert response.status_code == 200
response = client.get("/custom-static/not_exists.py")
assert response.status_code == 404
response = client.get("/custom-static/../LICENSE")