Skip to content

Commit

Permalink
Trim excess leading path separators
Browse files Browse the repository at this point in the history
A URL with excess leading / (path-separator)s would cause urllib3 to
attempt to reparse the request-uri as a full URI with a host and port.
This bypasses that logic in ConnectionPool.urlopen by replacing these
leading /s with just a single /.

Closes #6643
  • Loading branch information
sigmavirus24 committed Feb 23, 2024
1 parent 7a13c04 commit 60389df
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/requests/adapters.py
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,9 @@ def request_url(self, request, proxies):
using_socks_proxy = proxy_scheme.startswith("socks")

url = request.path_url
if url.startswith("//"): # Don't confuse urllib3
url = f"/{url.lstrip('/')}"

if is_proxied_http_request and not using_socks_proxy:
url = urldefragauth(request.url)

Expand Down
8 changes: 8 additions & 0 deletions tests/test_adapters.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import requests.adapters


def test_request_url_trims_leading_path_separators():
"""See also https://github.com/psf/requests/issues/6643."""
a = requests.adapters.HTTPAdapter()
p = requests.Request(method="GET", url="http://127.0.0.1:10000//v:h").prepare()
assert "/v:h" == a.request_url(p, {})

0 comments on commit 60389df

Please sign in to comment.