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

Fixed #32904 -- Made parse_time() more strict. 

Thanks Keryn Knight for the report.
This commit is contained in:
abhiabhi94 2021-07-07 12:51:12 +05:30 committed by Mariusz Felisiak
parent 68cc04887b
commit cf6774a53b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/utils/dateparse.py
View File

@ -16,7 +16,7 @@ date_re = _lazy_re_compile(
time_re = _lazy_re_compile( time_re = _lazy_re_compile(
r'(?P<hour>\d{1,2}):(?P<minute>\d{1,2})' r'(?P<hour>\d{1,2}):(?P<minute>\d{1,2})'
r'(?::(?P<second>\d{1,2})(?:[\.,](?P<microsecond>\d{1,6})\d{0,6})?)?' r'(?::(?P<second>\d{1,2})(?:[\.,](?P<microsecond>\d{1,6})\d{0,6})?)?$'
) )
datetime_re = _lazy_re_compile( datetime_re = _lazy_re_compile(

8
tests/utils_tests/test_dateparse.py
View File

@ -27,10 +27,12 @@ class DateParseTests(unittest.TestCase):
self.assertEqual(parse_time('4:8:16'), time(4, 8, 16)) self.assertEqual(parse_time('4:8:16'), time(4, 8, 16))
# Time zone offset is ignored. # Time zone offset is ignored.
self.assertEqual(parse_time('00:05:23+04:00'), time(0, 5, 23)) self.assertEqual(parse_time('00:05:23+04:00'), time(0, 5, 23))
# These should be invalid, see #32904.
self.assertEqual(parse_time('00:05:'), time(0, 5))
self.assertEqual(parse_time('4:18:101'), time(4, 18, 10))
# Invalid inputs # Invalid inputs
self.assertIsNone(parse_time('00:05:'))
self.assertIsNone(parse_time('00:05:23,'))
self.assertIsNone(parse_time('00:05:23+'))
self.assertIsNone(parse_time('00:05:23+25:00'))
self.assertIsNone(parse_time('4:18:101'))
self.assertIsNone(parse_time('091500')) self.assertIsNone(parse_time('091500'))
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
parse_time('09:15:90') parse_time('09:15:90')