From 241a04371bb3b1f09d91e1f5877655c54627071c Mon Sep 17 00:00:00 2001
From: Senthil Kumaran <orsenthil@gmail.com>
Date: Tue, 20 Apr 2010 20:37:59 +0000
Subject: [PATCH] Issue2987 - Added additional Invalid URL and changed the
Invalid URL checking code for better.
---
Lib/test/test_urlparse.py | 1 +
Lib/urlparse.py | 14 ++++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
index 4085de7bf5b..c25b6e0dd74 100644
--- a/Lib/test/test_urlparse.py
+++ b/Lib/test/test_urlparse.py
@@ -272,6 +272,7 @@ class UrlParseTestCase(unittest.TestCase):
for invalid_url in [
'http://::12.34.56.78]/',
'http://[::1/foo/',
+ 'http://[::1/foo/bad]/bad',
'http://[::ffff:12.34.56.78']:
self.assertRaises(ValueError, lambda : urlparse.urlparse(invalid_url).hostname)
self.assertRaises(ValueError, lambda : urlparse.urlparse(invalid_url))
diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index 8c37dff50ca..1a8151804d4 100644
--- a/Lib/urlparse.py
+++ b/Lib/urlparse.py
@@ -90,8 +90,6 @@ class ResultMixin(object):
netloc = self.netloc.split('@')[-1]
if '[' in netloc and ']' in netloc:
return netloc.split(']')[0][1:].lower()
- elif '[' in netloc or ']' in netloc:
- raise ValueError("Invalid IPv6 hostname")
elif ':' in netloc:
return netloc.split(':')[0].lower()
elif netloc == '':
@@ -151,10 +149,6 @@ def _splitparams(url):
def _splitnetloc(url, start=0):
delim = len(url) # position of end of domain part of url, default is end
- if '[' in url: # check for invalid IPv6 URL
- if not ']' in url: raise ValueError("Invalid IPv6 URL")
- elif ']' in url:
- if not '[' in url: raise ValueError("Invalid IPv6 URL")
for c in '/?#': # look for delimiters; the order is NOT important
wdelim = url.find(c, start) # find first of this delim
if wdelim >= 0: # if found
@@ -182,6 +176,10 @@ def urlsplit(url, scheme='', allow_fragments=True):
url = url[i+1:]
if url[:2] == '//':
netloc, url = _splitnetloc(url, 2)
+ if '[' in netloc :
+ if not ']' in netloc: raise ValueError("Invalid IPv6 URL")
+ if ']' in netloc:
+ if not '[' in netloc: raise ValueError("Invalid IPv6 URL")
if allow_fragments and '#' in url:
url, fragment = url.split('#', 1)
if '?' in url:
@@ -197,6 +195,10 @@ def urlsplit(url, scheme='', allow_fragments=True):
if url[:2] == '//':
netloc, url = _splitnetloc(url, 2)
+ if '[' in netloc:
+ if not ']' in netloc: raise ValueError("Invalid IPv6 URL")
+ if ']' in netloc:
+ if not '[' in netloc: raise ValueError("Invalid IPv6 URL")
if allow_fragments and scheme in uses_fragment and '#' in url:
url, fragment = url.split('#', 1)
if scheme in uses_query and '?' in url:
--
2.30.9