May 16, 2023 · May 6, 2023 · May 6, 2023 · May 8, 2023 · May 8, 2023 · May 10, 2023
diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
      one will be automatically generated and transmitted if not provided in
      the headers argument.


 .. method:: HTTPConnection.get_proxy_response_headers()

   Returns a dictionary with the headers of the response received from
   the proxy server to the CONNECT request.

   If the CONNECT request was not sent, the method returns an empty dictionary.

   .. versionadded:: 3.12


 .. method:: HTTPConnection.connect()

   Connect to the server specified when the object was created.  By default,
diff --git a/Lib/http/client.py b/Lib/http/client.py
            break
    return headers

 def parse_headers(fp, _class=HTTPMessage):
    """Parses only RFC2822 headers from a file pointer.
 def _parse_header_lines(header_lines, _class=HTTPMessage):
    """
    Parses only RFC2822 headers from header lines.

    email Parser wants to see strings rather than bytes.
    But a TextIOWrapper around self.rfile would buffer too many bytes
    to parse.

    """
    headers = _read_headers(fp)
    hstring = b''.join(headers).decode('iso-8859-1')
    hstring = b''.join(header_lines).decode('iso-8859-1')
    return email.parser.Parser(_class=_class).parsestr(hstring)

 def parse_headers(fp, _class=HTTPMessage):
    """Parses only RFC2822 headers from a file pointer."""

    headers = _read_headers(fp)
    return _parse_header_lines(headers, _class)


 class HTTPResponse(io.BufferedIOBase):

        self._tunnel_host = None
        self._tunnel_port = None
        self._tunnel_headers = {}
        self._proxy_response_headers = None
        self._raw_proxy_headers = None

        (self.host, self.port) = self._get_hostport(host, port)

        try:
            (version, code, message) = response._read_status()

            self._proxy_response_headers =parse_headers(response.fp)
            self._raw_proxy_headers =_read_headers(response.fp)

            if self.debuglevel > 0:
                forhdr, valin self._proxy_response_headers.items():
                    print("header:", hdr + ":", val)
                forheaderin self._raw_proxy_headers:
                    print('header:', header.decode())

            if code != http.HTTPStatus.OK:
                self.close()
        finally:
            response.close()

    def get_proxy_response_headers(self):
        """
        Returns a dictionary with the headers of the response
        received from the proxy server to the CONNECT request
        sent to set the tunnel.

        If the CONNECT request was not sent, the method returns
        an empty dictionary.
        """
        return (
            _parse_header_lines(self._raw_proxy_headers)
            if self._raw_proxy_headers is not None
            else {}
        )

    def connect(self):
        """Connect to the host and port specified in __init__."""
        sys.audit("http.client.connect", self, self.host, self.port)
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
        self.conn.set_tunnel('destination.com')

        self.conn.request('PUT', '/', '')
        headers = self.conn._proxy_response_headers
        headers = self.conn.get_proxy_response_headers()
        self.assertIn(expected_header, headers.items())

    def test_tunnel_leak(self):
diff --git a/Misc/NEWS.d/next/Library/2021-05-16-14-28-30.bpo-24964.Oa5Ie_.rst b/Misc/NEWS.d/next/Library/2021-05-16-14-28-30.bpo-24964.Oa5Ie_.rst
 Addedattribute '_proxy_response_headers' toHTTPConnection class. This
 attribute containsthe headersof the proxy server response to the CONNECT
 request.
 Added:meth:`http.client.HTTPConnection.get_proxy_response_headers` that
 provides access totheHTTPheaderson a proxy server response to the
 ``CONNECT``request.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -394,6 +394,17 @@ HTTPConnection Objects
		one will be automatically generated and transmitted if not provided in
		the headers argument.


		.. method:: HTTPConnection.get_proxy_response_headers()

		Returns a dictionary with the headers of the response received from
		the proxy server to the CONNECT request.

		If the CONNECT request was not sent, the method returns an empty dictionary.

		.. versionadded:: 3.12


		.. method:: HTTPConnection.connect()

		Connect to the server specified when the object was created. By default,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -221,8 +221,9 @@ def _read_headers(fp):
		break
		return headers

		def parse_headers(fp, _class=HTTPMessage):
		"""Parses only RFC2822 headers from a file pointer.
		def _parse_header_lines(header_lines, _class=HTTPMessage):
		"""
		Parses only RFC2822 headers from header lines.

		email Parser wants to see strings rather than bytes.
		But a TextIOWrapper around self.rfile would buffer too many bytes
Expand All		@@ -231,10 +232,15 @@ def parse_headers(fp, _class=HTTPMessage):
		to parse.

		"""
		headers = _read_headers(fp)
		hstring = b''.join(headers).decode('iso-8859-1')
		hstring = b''.join(header_lines).decode('iso-8859-1')
		return email.parser.Parser(_class=_class).parsestr(hstring)

		def parse_headers(fp, _class=HTTPMessage):
		"""Parses only RFC2822 headers from a file pointer."""

		headers = _read_headers(fp)
		return _parse_header_lines(headers, _class)


		class HTTPResponse(io.BufferedIOBase):

Expand DownExpand Up		@@ -858,7 +864,7 @@ def __init__(self, host, port=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
		self._tunnel_host = None
		self._tunnel_port = None
		self._tunnel_headers = {}
		self._proxy_response_headers = None
		self._raw_proxy_headers = None

		(self.host, self.port) = self._get_hostport(host, port)

Expand DownExpand Up		@@ -945,11 +951,11 @@ def _tunnel(self):
		try:
		(version, code, message) = response._read_status()

		self._proxy_response_headers =parse_headers(response.fp)
		self._raw_proxy_headers =_read_headers(response.fp)

		if self.debuglevel > 0:
		forhdr, valin self._proxy_response_headers.items():
		print("header:", hdr + ":", val)
		forheaderin self._raw_proxy_headers:
		print('header:', header.decode())

		if code != http.HTTPStatus.OK:
		self.close()
Expand All		@@ -958,6 +964,21 @@ def _tunnel(self):
		finally:
		response.close()

		def get_proxy_response_headers(self):
gpshead marked this conversation as resolved. Show resolvedHide resolved
		"""
		Returns a dictionary with the headers of the response
		received from the proxy server to the CONNECT request
		sent to set the tunnel.

		If the CONNECT request was not sent, the method returns
		an empty dictionary.
		"""
		return (
		_parse_header_lines(self._raw_proxy_headers)
		if self._raw_proxy_headers is not None
		else {}
		)

		def connect(self):
		"""Connect to the host and port specified in __init__."""
		sys.audit("http.client.connect", self, self.host, self.port)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2401,7 +2401,7 @@ def test_proxy_response_headers(self):
		self.conn.set_tunnel('destination.com')

		self.conn.request('PUT', '/', '')
		headers = self.conn._proxy_response_headers
		headers = self.conn.get_proxy_response_headers()
		self.assertIn(expected_header, headers.items())

		def test_tunnel_leak(self):
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,3 @@
		Addedattribute '_proxy_response_headers' toHTTPConnection class. This
		attribute containsthe headersof the proxy server response to the CONNECT
		request.
		Added:meth:`http.client.HTTPConnection.get_proxy_response_headers` that
		provides access totheHTTPheaderson a proxy server response to the
		``CONNECT``request.