Skip to content

Inject SSL context into urllib3 ProxyManager, too #13343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Inject SSL context into urllib3 ProxyManager, too #13343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/13343.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Ensure truststore feature remains active even when a proxy is also in use.
8 changes: 8 additions & 0 deletions src/pip/_internal/network/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
from ssl import SSLContext

from pip._vendor.urllib3.poolmanager import PoolManager
from pip._vendor.urllib3.proxymanager import ProxyManager


logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -286,6 +287,13 @@ def init_poolmanager(
**pool_kwargs,
)

def proxy_manager_for(self, proxy: str, **proxy_kwargs: Any) -> "ProxyManager":
# Proxy manager replaces the pool manager, so inject our SSL
# context here too. https://github.com/pypa/pip/issues/13288
if self._ssl_context is not None:
proxy_kwargs.setdefault("ssl_context", self._ssl_context)
return super().proxy_manager_for(proxy, **proxy_kwargs) # type: ignore[misc]


class HTTPAdapter(_SSLContextAdapterMixin, _BaseHTTPAdapter):
pass
Expand Down