Skip to content

feat(transport): Use env vars for default CA cert bundle location #3160

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
Jun 24, 2024
Merged

feat(transport): Use env vars for default CA cert bundle location #3160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
863562f
feat(transport): Use env vars for default CA cert bundle location
DragoonAethis Jun 12, 2024
d5ad4f1
Merge branch 'master' into ca-certs-from-env-vars
sl0thentr0py Jun 24, 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
9 changes: 8 additions & 1 deletion sentry_sdk/transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from abc import ABC, abstractmethod
import io
import os
import gzip
import socket
import time
Expand Down Expand Up @@ -457,7 +458,6 @@ def _get_pool_options(self, ca_certs):
options = {
"num_pools": self._num_pools,
"cert_reqs": "CERT_REQUIRED",
"ca_certs": ca_certs or certifi.where(),
}

socket_options = None # type: Optional[List[Tuple[int, int, int | bytes]]]
Expand All @@ -477,6 +477,13 @@ def _get_pool_options(self, ca_certs):
if socket_options is not None:
options["socket_options"] = socket_options

options["ca_certs"] = (
ca_certs # User-provided bundle from the SDK init
or os.environ.get("SSL_CERT_FILE")
or os.environ.get("REQUESTS_CA_BUNDLE")
or certifi.where()
)

return options

def _in_no_proxy(self, parsed_dsn):
Expand Down