Skip to content

bpo-35906: Fix CRLF injection in urllib #12524

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

Closed
push0ebp wants to merge 3 commits into from
Closed

bpo-35906: Fix CRLF injection in urllib #12524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08a024b
bpo-35906: Fix CRLF injection in urllib
push0ebp Mar 24, 2019
fc915b3
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 24, 2019
4c6887b
Fix white space issue
push0ebp Mar 24, 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: 10 additions & 0 deletions Lib/test/test_urlparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,6 +1059,16 @@ def test_splithost(self):
self.assertEqual(splithost("//example.net/file#"),
('example.net', '/file#'))

# bpo-35906: disallow line breaks
self.assertEqual(splithost('//127.0.0.1:1234/?q=HTTP/1.1\r\nHeader: Value'),
(None, '//127.0.0.1:1234/?q=HTTP/1.1\r\nHeader: Value'))

self.assertEqual(splithost('//127.0.0.1:1234?q=HTTP/1.1\r\nHeader: Value'),
(None, '//127.0.0.1:1234?q=HTTP/1.1\r\nHeader: Value'))

self.assertEqual(splithost('//127.0.0.1:1234#q=HTTP/1.1\r\nHeader: Value'),
(None, '//127.0.0.1:1234#q=HTTP/1.1\r\nHeader: Value'))

def test_splituser(self):
splituser = urllib.parse._splituser
self.assertEqual(splituser('User:Pass@www.python.org:080'),
Expand Down
2 changes: 1 addition & 1 deletion Lib/urllib/parse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ def _splithost(url):
"""splithost('//host[:port]/path') --> 'host[:port]', '/path'."""
global _hostprog
if _hostprog is None:
_hostprog = re.compile('//([^/#?]*)(.*)', re.DOTALL)
_hostprog = re.compile('//([^/#?]*)(.*)$')

match = _hostprog.match(url)
if match:
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2019-03-24-14-36-23.bpo-35906.TU53mt.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix CRLF injection in urllib as disallowing line breaks in parse