Skip to content

Commit

Permalink
pythongh-99418: Make urllib.parse.urlparse enforce that a scheme must…
Browse files Browse the repository at this point in the history
… begin with an alphabetical ASCII character. (pythonGH-99421)

Prevent urllib.parse.urlparse from accepting schemes that don't begin with an alphabetical ASCII character.

RFC 3986 defines a scheme like this: `scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )`
RFC 2234 defines an ALPHA like this: `ALPHA = %x41-5A / %x61-7A`

The WHATWG URL spec defines a scheme like this:
`"A URL-scheme string must be one ASCII alpha, followed by zero or more of ASCII alphanumeric, U+002B (+), U+002D (-), and U+002E (.)."`
(cherry picked from commit 439b9cf)

Co-authored-by: Ben Kallus <49924171+kenballus@users.noreply.github.com>
  • Loading branch information
2 people authored and mgorny committed Sep 7, 2024
1 parent 4742bf1 commit 64a1112
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
18 changes: 18 additions & 0 deletions Lib/test/test_urlparse.py
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,24 @@ def test_attributes_bad_port(self):
with self.assertRaises(ValueError):
p.port

def test_attributes_bad_scheme(self):
"""Check handling of invalid schemes."""
for bytes in (False, True):
for parse in (urllib.parse.urlsplit, urllib.parse.urlparse):
for scheme in (".", "+", "-", "0", "http&", "६http"):
with self.subTest(bytes=bytes, parse=parse, scheme=scheme):
url = scheme + "://www.example.net"
if bytes:
if url.isascii():
url = url.encode("ascii")
else:
continue
p = parse(url)
if bytes:
self.assertEqual(p.scheme, b"")
else:
self.assertEqual(p.scheme, "")

def test_attributes_without_netloc(self):
# This example is straight from RFC 3261. It looks like it
# should allow the username, hostname, and port to be filled
Expand Down
2 changes: 1 addition & 1 deletion Lib/urllib/parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ def urlsplit(url, scheme='', allow_fragments=True):
clear_cache()
netloc = query = fragment = ''
i = url.find(':')
if i > 0:
if i > 0 and url[0].isascii() and url[0].isalpha():
if url[:i] == 'http': # optimize the common case
url = url[i+1:]
if url[:2] == '//':
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix bug in :func:`urllib.parse.urlparse` that causes URL schemes that begin
with a digit, a plus sign, or a minus sign to be parsed incorrectly.

0 comments on commit 64a1112

Please sign in to comment.