datadog-checks-base 37.4.0__tar.gz → 37.5.0__tar.gz

{datadog_checks_base-37.4.0 → datadog_checks_base-37.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datadog-checks-base
-Version: 37.4.0
+Version: 37.5.0
 Summary: The Datadog Check Toolkit
 Project-URL: Source, https://github.com/DataDog/integrations-core
 Author-email: Datadog <packages@datadoghq.com>
@@ -13,40 +13,39 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: System :: Monitoring
 Provides-Extra: db
-Requires-Dist: mmh3==4.1.0; extra == 'db'
+Requires-Dist: mmh3==5.0.1; extra == 'db'
 Provides-Extra: deps
 Requires-Dist: binary==1.0.1; extra == 'deps'
 Requires-Dist: cachetools==5.5.0; extra == 'deps'
 Requires-Dist: cryptography==43.0.1; extra == 'deps'
 Requires-Dist: ddtrace==2.10.6; extra == 'deps'
-Requires-Dist: importlib-metadata==2.1.3; (python_version < '3.8') and extra == 'deps'
-Requires-Dist: jellyfish==1.1.0; extra == 'deps'
-Requires-Dist: prometheus-client==0.20.0; extra == 'deps'
-Requires-Dist: protobuf==5.27.3; extra == 'deps'
-Requires-Dist: pydantic==2.8.2; extra == 'deps'
+Requires-Dist: jellyfish==1.1.3; extra == 'deps'
+Requires-Dist: prometheus-client==0.21.1; extra == 'deps'
+Requires-Dist: protobuf==5.29.3; extra == 'deps'
+Requires-Dist: pydantic==2.10.5; extra == 'deps'
 Requires-Dist: python-dateutil==2.9.0.post0; extra == 'deps'
-Requires-Dist: pywin32==306; (sys_platform == 'win32') and extra == 'deps'
+Requires-Dist: pywin32==308; (sys_platform == 'win32') and extra == 'deps'
 Requires-Dist: pyyaml==6.0.2; extra == 'deps'
 Requires-Dist: requests-toolbelt==1.0.0; extra == 'deps'
 Requires-Dist: requests-unixsocket2==0.4.2; extra == 'deps'
 Requires-Dist: requests==2.32.3; extra == 'deps'
 Requires-Dist: simplejson==3.19.3; extra == 'deps'
 Requires-Dist: uptime==3.0.1; extra == 'deps'
-Requires-Dist: wrapt==1.16.0; extra == 'deps'
+Requires-Dist: wrapt==1.17.2; extra == 'deps'
 Provides-Extra: http
 Requires-Dist: aws-requests-auth==0.4.3; extra == 'http'
-Requires-Dist: botocore==1.35.10; extra == 'http'
+Requires-Dist: botocore==1.36.1; extra == 'http'
 Requires-Dist: oauthlib==3.2.2; extra == 'http'
-Requires-Dist: pyjwt==2.9.0; extra == 'http'
+Requires-Dist: pyjwt==2.10.1; extra == 'http'
 Requires-Dist: pyopenssl==24.2.1; extra == 'http'
 Requires-Dist: pysocks==1.7.1; extra == 'http'
 Requires-Dist: requests-kerberos==0.15.0; extra == 'http'
 Requires-Dist: requests-ntlm==1.3.0; extra == 'http'
 Requires-Dist: requests-oauthlib==2.0.0; extra == 'http'
 Provides-Extra: json
-Requires-Dist: orjson==3.10.7; extra == 'json'
+Requires-Dist: orjson==3.10.14; extra == 'json'
 Provides-Extra: kube
-Requires-Dist: kubernetes==30.1.0; extra == 'kube'
+Requires-Dist: kubernetes==31.0.0; extra == 'kube'
 Requires-Dist: requests-oauthlib==2.0.0; extra == 'kube'
 Description-Content-Type: text/markdown
 

{datadog_checks_base-37.4.0 → datadog_checks_base-37.5.0}/datadog_checks/base/__about__.py

@@ -1,4 +1,4 @@
 # (C) Datadog, Inc. 2018-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-__version__ = "37.4.0"
+__version__ = "37.5.0"

{datadog_checks_base-37.4.0 → datadog_checks_base-37.5.0}/datadog_checks/base/utils/agent/packages.py

@@ -1,12 +1,7 @@
 # (C) Datadog, Inc. 2019-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-import sys
-
-if sys.version_info >= (3, 8):
-    from importlib.metadata import distributions
-else:
-    from importlib_metadata import distributions
+from importlib.metadata import distributions
 
 DATADOG_CHECK_PREFIX = 'datadog-'
 

{datadog_checks_base-37.4.0 → datadog_checks_base-37.5.0}/datadog_checks/base/utils/http.py

@@ -52,6 +52,8 @@ LOGGER = logging.getLogger(__file__)
 # https://tools.ietf.org/html/rfc2988
 DEFAULT_TIMEOUT = 10
 
+DEFAULT_EXPIRATION = 300
+
 # 16 KiB seems optimal, and is also the standard chunk size of the Bittorrent protocol:
 # https://www.bittorrent.org/beps/bep_0003.html
 DEFAULT_CHUNK_SIZE = 16
@@ -92,6 +94,7 @@ STANDARD_FIELDS = {
     'tls_private_key': None,
     'tls_protocols_allowed': DEFAULT_PROTOCOL_VERSIONS,
     'tls_verify': True,
+    'tls_ciphers': 'ALL',
     'timeout': DEFAULT_TIMEOUT,
     'use_legacy_auth_encoding': True,
     'username': None,
@@ -153,6 +156,7 @@ class RequestsWrapper(object):
         'auth_token_handler',
         'request_size',
         'tls_protocols_allowed',
+        'tls_ciphers_allowed',
     )
 
     def __init__(self, instance, init_config, remapper=None, logger=None, session=None):
@@ -347,6 +351,14 @@ class RequestsWrapper(object):
         if config['kerberos_cache']:
             self.request_hooks.append(lambda: handle_kerberos_cache(config['kerberos_cache']))
 
+        ciphers = config.get('tls_ciphers')
+        if ciphers:
+            if 'ALL' in ciphers:
+                updated_ciphers = "ALL"
+            else:
+                updated_ciphers = ":".join(ciphers)
+        self.tls_ciphers_allowed = updated_ciphers
+
     def get(self, url, **options):
         return self._request('get', url, options)
 
@@ -465,6 +477,7 @@ class RequestsWrapper(object):
             try:
                 context = ssl.SSLContext(protocol=ssl.PROTOCOL_TLS)
                 context.verify_mode = ssl.CERT_NONE
+                context.set_ciphers(self.tls_ciphers_allowed)
 
                 with context.wrap_socket(sock, server_hostname=hostname) as secure_sock:
                     der_cert = secure_sock.getpeercert(binary_form=True)
@@ -856,8 +869,16 @@ class AuthTokenOAuthReader(object):
 
             # https://www.rfc-editor.org/rfc/rfc6749#section-4.4.3
             self._token = response['access_token']
-            self._expiration = get_timestamp() + response['expires_in']
-
+            self._expiration = get_timestamp()
+            try:
+                # According to https://www.rfc-editor.org/rfc/rfc6749#section-5.1, the `expires_in` field is optional
+                self._expiration += _parse_expires_in(response.get('expires_in'))
+            except TypeError:
+                LOGGER.debug(
+                    'The `expires_in` field of the OAuth2 response is not a number, defaulting to %s',
+                    DEFAULT_EXPIRATION,
+                )
+                self._expiration += DEFAULT_EXPIRATION
             return self._token
 
 
@@ -991,6 +1012,21 @@ def quote_uds_url(url):
     return urlunparse(parsed)
 
 
+def _parse_expires_in(token_expiration):
+    if isinstance(token_expiration, int) or isinstance(token_expiration, float):
+        return token_expiration
+    if isinstance(token_expiration, str):
+        try:
+            token_expiration = int(token_expiration)
+        except ValueError:
+            LOGGER.debug('Could not convert %s to an integer', token_expiration)
+    else:
+        LOGGER.debug('Unexpected type for `expires_in`: %s.', type(token_expiration))
+        token_expiration = None
+
+    return token_expiration
+
+
 # For documentation generation
 # TODO: use an enum and remove STANDARD_FIELDS when mkdocstrings supports it
 class StandardFields(object):

{datadog_checks_base-37.4.0 → datadog_checks_base-37.5.0}/pyproject.toml

@@ -31,33 +31,32 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 db = [
-    "mmh3==4.1.0",
+    "mmh3==5.0.1",
 ]
 deps = [
     "binary==1.0.1",
     "cachetools==5.5.0",
     "cryptography==43.0.1",
     "ddtrace==2.10.6",
-    "importlib-metadata==2.1.3; python_version < '3.8'",
-    "jellyfish==1.1.0",
-    "prometheus-client==0.20.0",
-    "protobuf==5.27.3",
-    "pydantic==2.8.2",
+    "jellyfish==1.1.3",
+    "prometheus-client==0.21.1",
+    "protobuf==5.29.3",
+    "pydantic==2.10.5",
     "python-dateutil==2.9.0.post0",
-    "pywin32==306; sys_platform == 'win32'",
+    "pywin32==308; sys_platform == 'win32'",
     "pyyaml==6.0.2",
     "requests-toolbelt==1.0.0",
     "requests-unixsocket2==0.4.2",
     "requests==2.32.3",
     "simplejson==3.19.3",
     "uptime==3.0.1",
-    "wrapt==1.16.0",
+    "wrapt==1.17.2",
 ]
 http = [
     "aws-requests-auth==0.4.3",
-    "botocore==1.35.10",
+    "botocore==1.36.1",
     "oauthlib==3.2.2",
-    "pyjwt==2.9.0",
+    "pyjwt==2.10.1",
     "pyopenssl==24.2.1",
     "pysocks==1.7.1",
     "requests-kerberos==0.15.0",
@@ -65,10 +64,10 @@ http = [
     "requests-oauthlib==2.0.0",
 ]
 json = [
-    "orjson==3.10.7",
+    "orjson==3.10.14",
 ]
 kube = [
-    "kubernetes==30.1.0",
+    "kubernetes==31.0.0",
     "requests-oauthlib==2.0.0",
 ]
 

{datadog_checks_base-37.4.0 → datadog_checks_base-37.5.0}/tests/base/utils/http/test_authtoken.py

@@ -9,7 +9,7 @@ import mock
 import pytest
 
 from datadog_checks.base import ConfigurationError
-from datadog_checks.base.utils.http import RequestsWrapper
+from datadog_checks.base.utils.http import DEFAULT_EXPIRATION, RequestsWrapper
 from datadog_checks.base.utils.time import get_timestamp
 from datadog_checks.dev import TempDir
 from datadog_checks.dev.fs import read_file, write_file
@@ -469,7 +469,21 @@ class TestAuthTokenOAuth:
             with pytest.raises(Exception, match='OAuth2 client credentials grant error: unauthorized_client'):
                 http.get('https://www.google.com')
 
-    def test_success(self):
+    @pytest.mark.parametrize(
+        'token_response, expected_expiration',
+        [
+            pytest.param({'access_token': 'foo', 'expires_in': 9000}, 9000, id='With expires_in'),
+            pytest.param({'access_token': 'foo'}, DEFAULT_EXPIRATION, id='Without expires_in'),
+            pytest.param(
+                {'access_token': 'foo', 'expires_in': 'two minutes'}, DEFAULT_EXPIRATION, id='With string expires_in'
+            ),
+            pytest.param({'access_token': 'foo', 'expires_in': '3600'}, 3600, id='With numeric string expires_in'),
+            pytest.param(
+                {'access_token': 'foo', 'expires_in': [1, 2, 3]}, DEFAULT_EXPIRATION, id='With list expires_in'
+            ),
+        ],
+    )
+    def test_success(self, token_response, expected_expiration):
         instance = {
             'auth_token': {
                 'reader': {'type': 'oauth', 'url': 'foo', 'client_id': 'bar', 'client_secret': 'baz'},
@@ -487,11 +501,11 @@ class TestAuthTokenOAuth:
                 pass
 
             def fetch_token(self, *args, **kwargs):
-                return {'access_token': 'foo', 'expires_in': 9000}
+                return token_response
 
         with mock.patch('requests.get') as get, mock.patch('oauthlib.oauth2.BackendApplicationClient'), mock.patch(
             'requests_oauthlib.OAuth2Session', side_effect=MockOAuth2Session
-        ):
+        ), mock.patch('datadog_checks.base.utils.http.get_timestamp', return_value=0):
             http.get('https://www.google.com')
 
             get.assert_called_with(
@@ -506,6 +520,7 @@ class TestAuthTokenOAuth:
             )
 
             assert http.options['headers'] == expected_headers
+            assert http.auth_token_handler.reader._expiration == expected_expiration
 
     def test_success_with_auth_params(self):
         instance = {

{datadog_checks_base-37.4.0 → datadog_checks_base-37.5.0}/tests/base/utils/http/test_http.py

@@ -2,6 +2,7 @@
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
 import logging
+import ssl
 
 import mock
 import pytest
@@ -26,6 +27,39 @@ class TestAttribute:
         assert isinstance(check.http, RequestsWrapper)
 
 
+class TestTLSCiphers:
+    @pytest.mark.parametrize(
+        'instance,expected_ciphers',
+        [
+            pytest.param(
+                {'tls_verify': False},
+                'ALL',
+                id="No Ciphers, default to 'ALL'",
+            ),
+            pytest.param(
+                {'tls_ciphers': ['PSK-CAMELLIA128-SHA256', 'DHE-PSK-CAMELLIA128-SHA256']},
+                'PSK-CAMELLIA128-SHA256:DHE-PSK-CAMELLIA128-SHA256',
+                id='Add specific ciphers only',
+            ),
+            pytest.param(
+                {'tls_ciphers': ['ALL']},
+                'ALL',
+                id="'ALL' manually",
+            ),
+        ],
+    )
+    def test_cipher_construction(self, instance, expected_ciphers):
+        init_config = {}
+        http = RequestsWrapper(instance, init_config)
+        mock_socket = mock.MagicMock()
+
+        with mock.patch.object(ssl.SSLContext, 'set_ciphers') as mock_set_ciphers, mock.patch(
+            'datadog_checks.base.utils.http.create_socket_connection', return_value=mock_socket
+        ):
+            http.fetch_intermediate_certs('https://www.google.com')
+            mock_set_ciphers.assert_called_once_with(expected_ciphers)
+
+
 class TestRequestSize:
     def test_behavior_correct(self, mock_http_response):
         instance = {'request_size': 0.5}