p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #33571 -- Fixed static serving views crash when If-Modified-Since is empty. 

Regression in d6aff369ad.
This commit is contained in:
Collin Anderson 2022-03-11 00:19:01 -05:00 committed by GitHub
parent d90e34c61b
commit 71017a68a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/views/static.py
View File

@ -129,12 +129,14 @@ def was_modified_since(header=None, mtime=0, size=0):
if header is None: if header is None:
raise ValueError raise ValueError
matches = re.match(r"^([^;]+)(; length=([0-9]+))?$", header, re.IGNORECASE) matches = re.match(r"^([^;]+)(; length=([0-9]+))?$", header, re.IGNORECASE)
if matches is None:
raise ValueError
header_mtime = parse_http_date(matches[1]) header_mtime = parse_http_date(matches[1])
header_len = matches[3] header_len = matches[3]
if header_len and int(header_len) != size: if header_len and int(header_len) != size:
raise ValueError raise ValueError
if int(mtime) > header_mtime: if int(mtime) > header_mtime:
raise ValueError raise ValueError
except (AttributeError, ValueError, OverflowError): except (ValueError, OverflowError):
return True return True
return False return False

3
tests/view_tests/tests/test_static.py
View File

@ -191,3 +191,6 @@ class StaticUtilsTests(unittest.TestCase):
mtime = 1343416141.107817 mtime = 1343416141.107817
header = http_date(mtime) header = http_date(mtime)
self.assertFalse(was_modified_since(header, mtime)) self.assertFalse(was_modified_since(header, mtime))
def test_was_modified_since_empty_string(self):
self.assertTrue(was_modified_since(header="", mtime=1))