1
0
mirror of https://github.com/django/django.git synced 2024-12-22 17:16:24 +00:00

Do not allow FileSystemStorage.delete to receive an empty name

Refs #20660.
This commit is contained in:
Claude Paroz 2013-06-27 10:59:30 +02:00
parent ea3fe78a9d
commit 7fbab3ebaf
2 changed files with 9 additions and 0 deletions

View File

@ -231,6 +231,7 @@ class FileSystemStorage(Storage):
return name
def delete(self, name):
assert name, "The name argument is not allowed to be empty."
name = self.path(name)
# If the file exists, delete it from the filesystem.
# Note that there is a race between os.path.exists and os.remove:

View File

@ -364,6 +364,14 @@ class FileStorageTests(unittest.TestCase):
with self.assertRaises(IOError):
self.storage.save('error.file', f1)
def test_delete_no_name(self):
"""
Calling delete with an empty name should not try to remove the base
storage directory, but fail loudly (#20660).
"""
with self.assertRaises(AssertionError):
self.storage.delete('')
class CustomStorage(FileSystemStorage):
def get_available_name(self, name):