Skip to content

bpo-38804: Fix REDoS in http.cookiejar #17157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 22, 2019
Merged

bpo-38804: Fix REDoS in http.cookiejar #17157

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ecf7b84
bpo-38804: Fix REDoS in http.cookiejar
bcaller Nov 14, 2019
92f4602
📜🤖 Added by blurb_it.
blurb-it[bot] Nov 15, 2019
04a3c61
Regression test for http.cookiejar REDoS
bcaller Nov 15, 2019
e11dfbe
Improve performance of http.cookiejar.ISO_DATE_RE
bcaller Nov 15, 2019
bc43063
Test for ISO_DATE_RE sub-quadratic performance
bcaller Nov 15, 2019
11fd815
Update News / Acks
bcaller Nov 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Lib/http/cookiejar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,14 @@ def _str2time(day, mon, yr, hr, min, sec, tz):
(?::(\d\d))? # optional seconds
)? # optional clock
\s*
([-+]?\d{2,4}|(?![APap][Mm]\b)[A-Za-z]+)? # timezone
(?:
([-+]?\d{2,4}|(?![APap][Mm]\b)[A-Za-z]+) # timezone
\s*
)?
(?:
\(\w+\) # ASCII representation of timezone in parens.
\s*
(?:\(\w+\))? # ASCII representation of timezone in parens.
\s*$""", re.X | re.ASCII)
)?$""", re.X | re.ASCII)
def http2time(text):
"""Returns time in seconds since epoch of time represented by a string.

Expand Down