mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-09 01:46:20 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #29796 -- Added system check for STATICFILES_DIRS prefix ending with a slash.

Browse Source
This commit is contained in:
Paweł Kołodziej 2018-09-28 01:49:37 +02:00 committed by Tim Graham
parent 40c8ffad72
commit 05c578bc1f
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/contrib/staticfiles/finders.py
View File

@ -78,7 +78,13 @@ class FileSystemFinder(BaseFinder):
)) ))
for root in settings.STATICFILES_DIRS: for root in settings.STATICFILES_DIRS:
if isinstance(root, (list, tuple)): if isinstance(root, (list, tuple)):
_, root = root prefix, root = root
if prefix.endswith('/'):
errors.append(Error(
'The prefix %r in the STATICFILES_DIRS setting must '
'not end with a slash.' % prefix,
id='staticfiles.E003',
))
if settings.STATIC_ROOT and os.path.abspath(settings.STATIC_ROOT) == os.path.abspath(root): if settings.STATIC_ROOT and os.path.abspath(settings.STATIC_ROOT) == os.path.abspath(root):
errors.append(Error( errors.append(Error(
'The STATICFILES_DIRS setting should not contain the ' 'The STATICFILES_DIRS setting should not contain the '

2
docs/ref/checks.txt
View File

@ -731,3 +731,5 @@ configured:
or list. or list.
* **staticfiles.E002**: The :setting:`STATICFILES_DIRS` setting should not * **staticfiles.E002**: The :setting:`STATICFILES_DIRS` setting should not
contain the :setting:`STATIC_ROOT` setting. contain the :setting:`STATIC_ROOT` setting.
* **staticfiles.E003**: The prefix ``<prefix>`` in the
:setting:`STATICFILES_DIRS` setting must not end with a slash.

10
tests/staticfiles_tests/test_checks.py
View File

@ -75,3 +75,13 @@ class FindersCheckTests(SimpleTestCase):
id='staticfiles.E002', id='staticfiles.E002',
) )
]) ])
@override_settings(STATICFILES_DIRS=[('prefix/', '/fake/path')])
def test_prefix_contains_trailing_slash(self):
self.assertEqual(check_finders(None), [
Error(
"The prefix 'prefix/' in the STATICFILES_DIRS setting must "
"not end with a slash.",
id='staticfiles.E003',
)
])