Skip to content

fix: improve the detection and loading of default certificates #197

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 2 commits into from
Jul 11, 2024
Merged

fix: improve the detection and loading of default certificates #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ff9c70
fix: improve the detection and loading of default certificates
pyrooka Jul 11, 2024
d21f2ce
chore: use certificate detection through the `requests` library
pyrooka Jul 11, 2024
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
5 changes: 3 additions & 2 deletions ibm_cloud_sdk_core/http_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import ssl

from requests import certs
from requests.adapters import HTTPAdapter, DEFAULT_POOLBLOCK
from urllib3.util.ssl_ import create_urllib3_context


# pylint: disable=fixme
class SSLHTTPAdapter(HTTPAdapter):
"""Wraps the original HTTP adapter and adds additional SSL context."""

Expand All @@ -17,7 +17,8 @@ def init_poolmanager(self, connections, maxsize, block=DEFAULT_POOLBLOCK, **pool
"""Create and use custom SSL configuration."""

ssl_context = create_urllib3_context()
ssl_context.load_default_certs()
# NOTE: https://github.com/psf/requests/pull/6731/files#r1622893724
ssl_context.load_verify_locations(certs.where())
ssl_context.minimum_version = ssl.TLSVersion.TLSv1_2

if self._disable_ssl_verification:
Expand Down
13 changes: 1 addition & 12 deletions test/test_http_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import threading
import warnings
from http.server import HTTPServer, SimpleHTTPRequestHandler
from ssl import get_default_verify_paths, SSLContext, PROTOCOL_TLSv1_1, PROTOCOL_TLSv1_2
from ssl import SSLContext, PROTOCOL_TLSv1_1, PROTOCOL_TLSv1_2
from typing import Callable

import pytest
Expand Down Expand Up @@ -105,17 +105,6 @@ def test_tls_v1_2():

ssl_context = service.http_adapter.poolmanager.connection_pool_kw.get("ssl_context")
assert ssl_context is not None
# In some cases (especially in Ubuntu containers that we use for testing on Travis)
# the default CA certificates are stored in a different place, so let's try to
# load those before making the final decision for this test case.
if len(ssl_context.get_ca_certs()) == 0:
try:
default_ca_path = get_default_verify_paths().capath
ssl_context.load_verify_locations(os.path.join(default_ca_path, 'ca-certificates.crt'))
except:
# Errors are ignored, let's jump straight to the assertion.
pass

assert len(ssl_context.get_ca_certs()) > 0

prepped = service.prepare_request('GET', url='/status')
Expand Down