datadog-checks-base 37.6.1__tar.gz → 37.7.0__tar.gz

{datadog_checks_base-37.6.1 → datadog_checks_base-37.7.0}/.gitignore

@@ -124,7 +124,4 @@ benchmark_*.svg
 .kube
 
 ## Direnv
-.envrc
-
-# Auto-generated during builds
-/ddev/src/ddev/_version.py
+.envrc

{datadog_checks_base-37.6.1 → datadog_checks_base-37.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datadog-checks-base
-Version: 37.6.1
+Version: 37.7.0
 Summary: The Datadog Check Toolkit
 Project-URL: Source, https://github.com/DataDog/integrations-core
 Author-email: Datadog <packages@datadoghq.com>

{datadog_checks_base-37.6.1 → datadog_checks_base-37.7.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.6.1"
+__version__ = "37.7.0"

{datadog_checks_base-37.6.1 → datadog_checks_base-37.7.0}/datadog_checks/base/stubs/aggregator.py

@@ -385,7 +385,7 @@ class AggregatorStub(object):
             if hostname is not None and hostname != sc.hostname:
                 continue
 
-            if message is not None and message != sc.message:
+            if message is not None and re.search(message, sc.message) is None:
                 continue
 
             candidates.append(sc)

{datadog_checks_base-37.6.1 → datadog_checks_base-37.7.0}/datadog_checks/base/utils/fips.py

@@ -2,7 +2,11 @@
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
 
+import logging
 import os
+import sys
+
+LOGGER = logging.getLogger(__file__)
 
 
 def enable_fips(path_to_openssl_conf=None, path_to_openssl_modules=None):
@@ -24,6 +28,32 @@ def enable_fips(path_to_openssl_conf=None, path_to_openssl_modules=None):
         os.environ["OPENSSL_MODULES"] = str(path_to_openssl_modules)
 
 
+def is_enabled():
+    enabled = False
+    # On Windows, FIPS mode is activated through a registry:
+    # https://csrc.nist.gov/CSRC/media/projects/cryptographic-module-validation-program/documents/security-policies/140sp4825.pdf
+    # We copy the Agent's implementation for this function:
+    # https://github.com/DataDog/datadog-agent/tree/main/pkg/fips
+    if sys.platform == "win32":
+        try:
+            import winreg
+
+            with winreg.OpenKey(
+                winreg.HKEY_LOCAL_MACHINE, r"SYSTEM\CurrentControlSet\Control\Lsa\FipsAlgorithmPolicy"
+            ) as key:
+                fips_registry, _ = winreg.QueryValueEx(key, "Enabled")
+                enabled = fips_registry == 1
+        except Exception as e:
+            LOGGER.debug(
+                "Windows error encountered when fetching FipsAlgorithmPolicy registry key,\
+                    assuming FIPS mode is disabled: %s",
+                e,
+            )
+    else:
+        enabled = os.environ.get("GOFIPS", "0") == "1"
+    return enabled
+
+
 def _get_embedded_path():
     import sys
     from pathlib import Path

{datadog_checks_base-37.6.1 → datadog_checks_base-37.7.0}/tests/base/checks/test_agent_check.py

@@ -6,6 +6,7 @@
 import json
 import logging
 import os
+import re
 from typing import Any  # noqa: F401
 
 import mock
@@ -111,7 +112,7 @@ class TestSecretsSanitization:
         secret = 'p@$$w0rd'
         check = AgentCheck()
         check.register_secret(secret)
-        sanitized = check.sanitize(secret)
+        sanitized = re.escape(check.sanitize(secret))
 
         check.service_check('test.can_check', status=AgentCheck.CRITICAL, message=secret)
 

datadog_checks_base-37.7.0/tests/base/utils/test_fips.py

@@ -0,0 +1,47 @@
+# (C) Datadog, Inc. 2025-present
+# All rights reserved
+# Licensed under a 3-clause BSD style license (see LICENSE)
+
+import sys
+
+import pytest
+
+from datadog_checks.base.utils.fips import is_enabled
+
+
+@pytest.fixture
+def set_fips_registry(request):
+    import winreg
+
+    winreg.SetValue(
+        winreg.HKEY_LOCAL_MACHINE, r"SYSTEM\CurrentControlSet\Control\Lsa\FipsAlgorithmPolicy", winreg.REG_SZ, "Enabled"
+    )
+
+
+@pytest.fixture
+def set_non_fips_registry(request):
+    import winreg
+
+    winreg.SetValue(
+        winreg.HKEY_LOCAL_MACHINE,
+        r"SYSTEM\CurrentControlSet\Control\Lsa\FipsAlgorithmPolicy",
+        winreg.REG_SZ,
+        "Disabled",
+    )
+
+
+@pytest.mark.parametrize("gofips_value,is_fips", [("0", False), ("1", True)])
+@pytest.mark.skipif(sys.platform == "win32", reason="Testing only on Linux")
+def test_fips_status_linux(monkeypatch, gofips_value, is_fips):
+    monkeypatch.setenv("GOFIPS", gofips_value)
+    assert is_enabled() == is_fips
+
+
+@pytest.mark.skipif(sys.platform != "win32", reason="Testing only on Windows")
+def test_fips_is_enabled_windows(set_fips_registry):
+    assert is_enabled()
+
+
+@pytest.mark.skipif(sys.platform != "win32", reason="Testing only on Windows")
+def test_fips_is_disabled_windows(set_non_fips_registry):
+    assert not is_enabled()

{datadog_checks_base-37.6.1 → datadog_checks_base-37.7.0}/tests/stubs/test_aggregator_service_checks.py

@@ -87,3 +87,9 @@ class TestServiceChecks(object):
             AssertionError, match="Expect `ok` value to be in service_check.json for service check test.service_check."
         ):
             aggregator.assert_service_checks(service_check_definition)
+
+    def test_assert_service_check_message_substring(self, aggregator):
+        check = AgentCheck()
+
+        check.service_check('test.service_check', AgentCheck.CRITICAL, message="Some service check message")
+        aggregator.assert_service_check('test.service_check', message="check")