mirror of
https://github.com/django/django.git
synced 2025-10-24 06:06:09 +00:00
Fixed #25905 -- Prevented leading slashes in urljoin() calls
Leading slashes in the second urljoin argument will return exactly that argument, breaking FileSystemStorage.url behavior if called with a parameter with leading slashes. Also added test cases for null bytes and None. Thanks to Markus for help and review.
This commit is contained in:
committed by
Russell Keith-Magee
parent
b7ea494d65
commit
fdf5cd3429
@@ -405,7 +405,10 @@ class FileSystemStorage(Storage):
|
||||
def url(self, name):
|
||||
if self.base_url is None:
|
||||
raise ValueError("This file is not accessible via a URL.")
|
||||
return urljoin(self.base_url, filepath_to_uri(name))
|
||||
url = filepath_to_uri(name)
|
||||
if url is not None:
|
||||
url = url.lstrip('/')
|
||||
return urljoin(self.base_url, url)
|
||||
|
||||
def accessed_time(self, name):
|
||||
warnings.warn(
|
||||
|
||||
Reference in New Issue
Block a user