Merge into servestatic

Archmonger · Aug 27, 2024 · e1d2b07 · e1d2b07
1 parent dc73e83
commit e1d2b07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 209 deletions.
diff --git a/src/servestatic/middleware.py b/src/servestatic/middleware.py
@@ -4,9 +4,10 @@
 import concurrent.futures
 import contextlib
 import os
-from posixpath import basename
+from posixpath import basename, normpath
 from typing import AsyncIterable
 from urllib.parse import urlparse
+from urllib.request import url2pathname
 
 import django
 from aiofiles.base import AiofilesContextManager
@@ -252,7 +253,10 @@ def add_files_from_finders(self):
 
     def candidate_paths_for_url(self, url):
         if self.use_finders and url.startswith(self.static_prefix):
-            path = finders.find(url[len(self.static_prefix) :])
+            relative_url = url[len(self.static_prefix) :]
+            path = url2pathname(relative_url)
+            normalized_path = normpath(path).lstrip("/")
+            path = finders.find(normalized_path)
             if path:
                 yield path
         paths = super().candidate_paths_for_url(url)

diff --git a/src/whitenoise/middleware.py b/src/whitenoise/middleware.py