Skip to content
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

Jump to bottom

Load CA certs if SSL is enabled and CA certs are not passed in the configurations #10377

Merged
merged 5 commits into from
Oct 14, 2021
Merged

Load CA certs if SSL is enabled and CA certs are not passed in the configurations #10377

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6781723
added logic to load CA bundle only if ssl is required
steveny91 Oct 6, 2021
3b37359
clean up logic to load certifi CA certs incase SSL is needed and no C…
steveny91 Oct 7, 2021
7c383af
Fixed typo
steveny91 Oct 7, 2021
c45ed89
slight change in logic for clean up
steveny91 Oct 8, 2021
7c12c8c
clean up logic
steveny91 Oct 12, 2021
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
11 changes: 10 additions & 1 deletion mongo/datadog_checks/mongo/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import certifi

from datadog_checks.base import ConfigurationError, is_affirmative
from datadog_checks.base.utils.common import exclude_undefined_keys
from datadog_checks.mongo.common import DEFAULT_TIMEOUT
Expand All @@ -9,13 +11,20 @@ def __init__(self, instance, log):
self.log = log

# x.509 authentication

cacert_cert_dir = instance.get('ssl_ca_certs')
if cacert_cert_dir is None and (
is_affirmative(instance.get('options', {}).get("ssl")) or is_affirmative(instance.get('ssl'))
):
cacert_cert_dir = certifi.where()

self.ssl_params = exclude_undefined_keys(
{
'ssl': instance.get('ssl', None),
'ssl_keyfile': instance.get('ssl_keyfile', None),
'ssl_certfile': instance.get('ssl_certfile', None),
'ssl_cert_reqs': instance.get('ssl_cert_reqs', None),
'ssl_ca_certs': instance.get('ssl_ca_certs', None),
'ssl_ca_certs': cacert_cert_dir,
}
)

Expand Down