changeset: 74387:4b4029fc8cf2 parent: 74383:6797e7458ad0 parent: 74386:80e3b8de4edd user: Senthil Kumaran date: Sat Jan 14 19:12:28 2012 +0800 files: Lib/test/test_urllib.py Lib/urllib/request.py Misc/NEWS description: merge from 3.2 - Fix Issue #13642: Unquote before b64encoding user:password during Basic Authentication. diff -r 6797e7458ad0 -r 4b4029fc8cf2 Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py Sat Jan 14 18:39:23 2012 +0800 +++ b/Lib/test/test_urllib.py Sat Jan 14 19:12:28 2012 +0800 @@ -12,6 +12,8 @@ import sys import tempfile +from base64 import b64encode + def hexescape(char): """Escape char as RFC 2396 specifies""" hex_repr = hex(ord(char))[2:].upper() @@ -42,8 +44,8 @@ class FakeSocket(io.BytesIO): io_refs = 1 - def sendall(self, str): - pass + def sendall(self, data): + FakeHTTPConnection.buf = data def makefile(self, *args, **kwds): self.io_refs += 1 @@ -65,8 +67,13 @@ io.BytesIO.close(self) class FakeHTTPConnection(http.client.HTTPConnection): + + # buffer to store data for verification in urlopen tests. + buf = None + def connect(self): self.sock = FakeSocket(fakedata) + self._connection_class = http.client.HTTPConnection http.client.HTTPConnection = FakeHTTPConnection @@ -268,6 +275,25 @@ finally: self.unfakehttp() + def test_userpass_inurl_w_spaces(self): + self.fakehttp(b"HTTP/1.0 200 OK\r\n\r\nHello!") + try: + userpass = "a b:c d" + url = "http://{}@python.org/".format(userpass) + fakehttp_wrapper = http.client.HTTPConnection + authorization = ("Authorization: Basic %s\r\n" % + b64encode(userpass.encode("ASCII")).decode("ASCII")) + fp = urlopen(url) + # The authorization header must be in place + self.assertIn(authorization, fakehttp_wrapper.buf.decode("UTF-8")) + self.assertEqual(fp.readline(), b"Hello!") + self.assertEqual(fp.readline(), b"") + # the spaces are quoted in URL so no match + self.assertNotEqual(fp.geturl(), url) + self.assertEqual(fp.getcode(), 200) + finally: + self.unfakehttp() + class urlretrieve_FileTests(unittest.TestCase): """Test urllib.urlretrieve() on local files""" @@ -1111,6 +1137,9 @@ self.assertEqual(('user', 'a\fb'),urllib.parse.splitpasswd('user:a\fb')) self.assertEqual(('user', 'a\vb'),urllib.parse.splitpasswd('user:a\vb')) self.assertEqual(('user', 'a:b'),urllib.parse.splitpasswd('user:a:b')) + self.assertEqual(('user', 'a b'),urllib.parse.splitpasswd('user:a b')) + self.assertEqual(('user 2', 'ab'),urllib.parse.splitpasswd('user 2:ab')) + self.assertEqual(('user+1', 'a+b'),urllib.parse.splitpasswd('user+1:a+b')) def test_thishost(self): """Test the urllib.request.thishost utility function returns a tuple""" diff -r 6797e7458ad0 -r 4b4029fc8cf2 Lib/urllib/request.py --- a/Lib/urllib/request.py Sat Jan 14 18:39:23 2012 +0800 +++ b/Lib/urllib/request.py Sat Jan 14 19:12:28 2012 +0800 @@ -1693,11 +1693,13 @@ if not host: raise IOError('http error', 'no host given') if proxy_passwd: + proxy_passwd = unquote(proxy_passwd) proxy_auth = base64.b64encode(proxy_passwd.encode()).decode('ascii') else: proxy_auth = None if user_passwd: + user_passwd = unquote(user_passwd) auth = base64.b64encode(user_passwd.encode()).decode('ascii') else: auth = None diff -r 6797e7458ad0 -r 4b4029fc8cf2 Misc/NEWS --- a/Misc/NEWS Sat Jan 14 18:39:23 2012 +0800 +++ b/Misc/NEWS Sat Jan 14 19:12:28 2012 +0800 @@ -442,6 +442,9 @@ Library ------- +- Issue #13642: Unquote before b64encoding user:password during Basic + Authentication. Patch contributed by Joonas Kuorilehto. + - Issue #13726: Fix the ambiguous -S flag in regrtest. It is -o/--slow for slow tests.