https://github.com/python/cpython/commit/465db27cb983084e718a1fd9519b2726c96935cb
commit: 465db27cb983084e718a1fd9519b2726c96935cb
branch: main
author: Derek Higgins <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-02-17T10:10:12Z
summary:
gh-100985: Consistently wrap IPv6 IP address during CONNECT (GH-100986)
Update _get_hostport to always remove square brackets
from IPv6 addresses. Then add them if needed
in "CONNECT .." and "Host: ".
files:
A Misc/NEWS.d/next/Library/2023-01-12-14-16-01.gh-issue-100985.GT5Fvd.rst
M Lib/http/client.py
M Lib/test/test_httplib.py
M Misc/ACKS
diff --git a/Lib/http/client.py b/Lib/http/client.py
index 5eebfccafbca59..a353716a8506e6 100644
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -936,17 +936,23 @@ def _get_hostport(self, host, port):
host = host[:i]
else:
port = self.default_port
- if host and host[0] == '[' and host[-1] == ']':
- host = host[1:-1]
+ if host and host[0] == '[' and host[-1] == ']':
+ host = host[1:-1]
return (host, port)
def set_debuglevel(self, level):
self.debuglevel = level
+ def _wrap_ipv6(self, ip):
+ if b':' in ip and ip[0] != b'['[0]:
+ return b"[" + ip + b"]"
+ return ip
+
def _tunnel(self):
connect = b"CONNECT %s:%d %s\r\n" % (
- self._tunnel_host.encode("idna"), self._tunnel_port,
+ self._wrap_ipv6(self._tunnel_host.encode("idna")),
+ self._tunnel_port,
self._http_vsn_str.encode("ascii"))
headers = [connect]
for header, value in self._tunnel_headers.items():
@@ -1221,9 +1227,8 @@ def putrequest(self, method, url, skip_host=False,
# As per RFC 273, IPv6 address should be wrapped with []
# when used as Host header
-
+ host_enc = self._wrap_ipv6(host_enc)
if ":" in host:
- host_enc = b'[' + host_enc + b']'
host_enc = _strip_ipv6_iface(host_enc)
if port == self.default_port:
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 089bf5be40a0e2..6e63a8872d9c6e 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -2408,6 +2408,22 @@ def test_connect_put_request(self):
self.assertIn(b'PUT / HTTP/1.1\r\nHost: %(host)s\r\n' % d,
self.conn.sock.data)
+ def test_connect_put_request_ipv6(self):
+ self.conn.set_tunnel('[1:2:3::4]', 1234)
+ self.conn.request('PUT', '/', '')
+ self.assertEqual(self.conn.sock.host, self.host)
+ self.assertEqual(self.conn.sock.port, client.HTTP_PORT)
+ self.assertIn(b'CONNECT [1:2:3::4]:1234', self.conn.sock.data)
+ self.assertIn(b'Host: [1:2:3::4]:1234', self.conn.sock.data)
+
+ def test_connect_put_request_ipv6_port(self):
+ self.conn.set_tunnel('[1:2:3::4]:1234')
+ self.conn.request('PUT', '/', '')
+ self.assertEqual(self.conn.sock.host, self.host)
+ self.assertEqual(self.conn.sock.port, client.HTTP_PORT)
+ self.assertIn(b'CONNECT [1:2:3::4]:1234', self.conn.sock.data)
+ self.assertIn(b'Host: [1:2:3::4]:1234', self.conn.sock.data)
+
def test_tunnel_debuglog(self):
expected_header = 'X-Dummy: 1'
response_text = 'HTTP/1.0 200 OK\r\n{}\r\n\r\n'.format(expected_header)
diff --git a/Misc/ACKS b/Misc/ACKS
index 8a80e02ecba26a..f01c7a70a65dc5 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -756,6 +756,7 @@ Raymond Hettinger
Lisa Hewus Fresh
Kevan Heydon
Wouter van Heyst
+Derek Higgins
Kelsey Hightower
Jason Hildebrand
Ryan Hileman
diff --git
a/Misc/NEWS.d/next/Library/2023-01-12-14-16-01.gh-issue-100985.GT5Fvd.rst
b/Misc/NEWS.d/next/Library/2023-01-12-14-16-01.gh-issue-100985.GT5Fvd.rst
new file mode 100644
index 00000000000000..8d8693a5edb3d4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-01-12-14-16-01.gh-issue-100985.GT5Fvd.rst
@@ -0,0 +1,2 @@
+Update HTTPSConnection to consistently wrap IPv6 Addresses when using a
+proxy.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
