mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-12 02:12:38 +00:00
Code Issues 32 Releases Wiki Activity

Made HashedFilesMixin ignore URLs without a path.

Browse Source
This commit is contained in:
Florian Apolloner 2022-05-10 17:10:04 +02:00 committed by Mariusz Felisiak
parent d80a258553
commit e6f36ea0a9
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/staticfiles/storage.py
View File

@ -202,6 +202,10 @@ class HashedFilesMixin:
# Strip off the fragment so a path-like fragment won't interfere. # Strip off the fragment so a path-like fragment won't interfere.
url_path, fragment = urldefrag(url) url_path, fragment = urldefrag(url)
# Ignore URLs without a path
if not url_path:
return matched
if url_path.startswith("/"): if url_path.startswith("/"):
# Otherwise the condition above would have returned prematurely. # Otherwise the condition above would have returned prematurely.
assert url_path.startswith(settings.STATIC_URL) assert url_path.startswith(settings.STATIC_URL)

1
tests/staticfiles_tests/project/documents/cached/css/ignored.css
View File

@ -5,5 +5,6 @@ body {
background: url("data:foobar"); background: url("data:foobar");
background: url("chrome:foobar"); background: url("chrome:foobar");
background: url("//foobar"); background: url("//foobar");
background: url();
} }

3
tests/staticfiles_tests/test_storage.py
View File

@ -65,7 +65,7 @@ class TestHashedFiles:
def test_path_ignored_completely(self): def test_path_ignored_completely(self):
relpath = self.hashed_file_path("cached/css/ignored.css") relpath = self.hashed_file_path("cached/css/ignored.css")
self.assertEqual(relpath, "cached/css/ignored.554da52152af.css") self.assertEqual(relpath, "cached/css/ignored.55e7c226dda1.css")
with storage.staticfiles_storage.open(relpath) as relfile: with storage.staticfiles_storage.open(relpath) as relfile:
content = relfile.read() content = relfile.read()
self.assertIn(b"#foobar", content) self.assertIn(b"#foobar", content)
@ -74,6 +74,7 @@ class TestHashedFiles:
self.assertIn(b"data:foobar", content) self.assertIn(b"data:foobar", content)
self.assertIn(b"chrome:foobar", content) self.assertIn(b"chrome:foobar", content)
self.assertIn(b"//foobar", content) self.assertIn(b"//foobar", content)
self.assertIn(b"url()", content)
self.assertPostCondition() self.assertPostCondition()
def test_path_with_querystring(self): def test_path_with_querystring(self):