Skip to content

Commit

Permalink
Fix HTTPS proxy handling.
Browse files Browse the repository at this point in the history
  • Loading branch information
Albertas Agejevas authored and Albertas Agejevas committed Jan 23, 2024
1 parent 5a72ab9 commit d1719bd
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions vcr/stubs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,22 +186,34 @@ def _port_postfix(self):
"""
Returns empty string for the default port and ':port' otherwise
"""
port = self.real_connection.port
port = (
self.real_connection.port
if not self.real_connection._tunnel_host
else self.real_connection._tunnel_port
)
default_port = {"https": 443, "http": 80}[self._protocol]
return f":{port}" if port != default_port else ""

def _real_host(self):
"""Returns the request host"""
if self.real_connection._tunnel_host:
# The real connection is to an HTTPS proxy
return self.real_connection._tunnel_host
else:
return self.real_connection.host

def _uri(self, url):
"""Returns request absolute URI"""
if url and not url.startswith("/"):
# Then this must be a proxy request.
return url
uri = f"{self._protocol}://{self.real_connection.host}{self._port_postfix()}{url}"
uri = f"{self._protocol}://{self._real_host()}{self._port_postfix()}{url}"
log.debug("Absolute URI: %s", uri)
return uri

def _url(self, uri):
"""Returns request selector url from absolute URI"""
prefix = f"{self._protocol}://{self.real_connection.host}{self._port_postfix()}"
prefix = f"{self._protocol}://{self._real_host()}{self._port_postfix()}"
return uri.replace(prefix, "", 1)

def request(self, method, url, body=None, headers=None, *args, **kwargs):
Expand Down

0 comments on commit d1719bd

Please sign in to comment.