Skip to content

Avoid reloading root certificates to improve concurrent performance #6667

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

Merged
merged 4 commits into from
May 15, 2024
Merged

Avoid reloading root certificates to improve concurrent performance #6667

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec0e33b
Avoid setting a connection's `ca_certs` or `ca_cert_dir` attributes w…
agubelu Mar 20, 2024
8f95456
Use a default SSLContext with the default CA bundle loaded when `veri…
agubelu Mar 21, 2024
f21e70b
Rename default SSLContext to make it private by convention
agubelu May 7, 2024
4089f3d
Wrap line to comply with CI lint
agubelu May 15, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use a default SSLContext with the default CA bundle loaded when `veri… 
…fy=True`
  • Loading branch information
@agubelu
agubelu committed Mar 21, 2024
commit 8f954567bdfb7fa2bd638b7021b0a156e3f71787
12 changes: 10 additions & 2 deletions src/requests/adapters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from urllib3.util import Timeout as TimeoutSauce
from urllib3.util import parse_url
from urllib3.util.retry import Retry
from urllib3.util.ssl_ import create_urllib3_context

from .auth import _basic_auth_str
from .compat import basestring, urlparse
Expand Down Expand Up @@ -70,6 +71,8 @@ def SOCKSProxyManager(*args, **kwargs):
DEFAULT_POOLSIZE = 10
DEFAULT_RETRIES = 0
DEFAULT_POOL_TIMEOUT = None
DEFAULT_SSL_CONTEXT = create_urllib3_context()
DEFAULT_SSL_CONTEXT.load_verify_locations(extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH))


def _urllib3_request_context(
Expand All @@ -85,8 +88,13 @@ def _urllib3_request_context(
cert_reqs = "CERT_REQUIRED"
if verify is False:
cert_reqs = "CERT_NONE"
if isinstance(verify, str):
pool_kwargs["ca_certs"] = verify
elif verify is True:
pool_kwargs["ssl_context"] = DEFAULT_SSL_CONTEXT
elif isinstance(verify, str):
if not os.path.isdir(verify):
pool_kwargs["ca_certs"] = verify
else:
pool_kwargs["ca_cert_dir"] = verify
pool_kwargs["cert_reqs"] = cert_reqs
if client_cert is not None:
if isinstance(client_cert, tuple) and len(client_cert) == 2:
Expand Down