Skip to content

Commit e341df3

Browse files
committed
Set default ca_cert bundle if verify is True
1 parent 2769cb6 commit e341df3

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

Diff for: src/requests/adapters.py

+11-3
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,23 @@ def _urllib3_request_context(
118118
poolmanager_kwargs = getattr(poolmanager, "connection_pool_kw", {})
119119

120120
cert_reqs = "CERT_REQUIRED"
121+
cert_loc = None
121122
if verify is False:
122123
cert_reqs = "CERT_NONE"
123124
elif _should_use_default_context(verify, client_cert, poolmanager_kwargs):
124125
pool_kwargs["ssl_context"] = _preloaded_ssl_context
126+
elif verify is True:
127+
# Set default ca cert location if none provided
128+
cert_loc = extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH)
125129
elif isinstance(verify, str):
126-
if not os.path.isdir(verify):
127-
pool_kwargs["ca_certs"] = verify
130+
cert_loc = verify
131+
132+
if cert_loc is not None:
133+
if not os.path.isdir(cert_loc):
134+
pool_kwargs["ca_certs"] = cert_loc
128135
else:
129-
pool_kwargs["ca_cert_dir"] = verify
136+
pool_kwargs["ca_cert_dir"] = cert_loc
137+
130138
pool_kwargs["cert_reqs"] = cert_reqs
131139
if client_cert is not None:
132140
if isinstance(client_cert, tuple) and len(client_cert) == 2:

0 commit comments

Comments
 (0)