From 6d9c1b1617b30ee24eaa358f4142706148d21922 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Sat, 19 May 2012 17:12:17 +0300 Subject: #14072: Fix parsing of tel URIs in urlparse by making the check for ports stricter. --- Lib/test/test_urlparse.py | 7 +++++++ Lib/urlparse.py | 12 ++++++------ Misc/NEWS | 3 +++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py index 827282c..e484aaf 100644 --- a/Lib/test/test_urlparse.py +++ b/Lib/test/test_urlparse.py @@ -437,6 +437,13 @@ class UrlParseTestCase(unittest.TestCase): self.assertEqual(p.port, 80) self.assertEqual(p.geturl(), url) + def test_issue14072(self): + p1 = urlparse.urlsplit('tel:+31-641044153') + self.assertEqual(p1.scheme, 'tel') + self.assertEqual(p1.path, '+31-641044153') + p2 = urlparse.urlsplit('tel:+31641044153') + self.assertEqual(p2.scheme, 'tel') + self.assertEqual(p2.path, '+31641044153') def test_attributes_bad_port(self): """Check handling of non-integer ports.""" diff --git a/Lib/urlparse.py b/Lib/urlparse.py index 32eebe6..4c57725 100644 --- a/Lib/urlparse.py +++ b/Lib/urlparse.py @@ -185,12 +185,12 @@ def urlsplit(url, scheme='', allow_fragments=True): if c not in scheme_chars: break else: - try: - # make sure "url" is not actually a port number (in which case - # "scheme" is really part of the path - _testportnum = int(url[i+1:]) - except ValueError: - scheme, url = url[:i].lower(), url[i+1:] + # make sure "url" is not actually a port number (in which case + # "scheme" is really part of the path) + rest = url[i+1:] + if not rest or any(c not in '0123456789' for c in rest): + # not a port number + scheme, url = url[:i].lower(), rest if url[:2] == '//': netloc, url = _splitnetloc(url, 2) diff --git a/Misc/NEWS b/Misc/NEWS index 503e2f8..be55960 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -63,6 +63,9 @@ Library - Issue #14721: Send proper header, Content-length: 0 when the body is an empty string ''. Initial Patch contributed by Arve Knudsen. +- Issue #14072: Fix parsing of 'tel' URIs in urlparse by making the check for + ports stricter. + - Issue #9374: Generic parsing of query and fragment portions of url for any scheme. Supported both by RFC3986 and RFC2396. -- cgit v0.12