check-msdefender 1.2.1__tar.gz → 1.2.4__tar.gz

{check_msdefender-1.2.1 → check_msdefender-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: check-msdefender
-Version: 1.2.1
+Version: 1.2.4
 Summary: A Nagios plugin for monitoring Microsoft Defender API endpoints
 Keywords: nagios,monitoring,microsoft,graph,api,azure
 Author-Email: ldvchosal <ldvchosal@github.com>

{check_msdefender-1.2.1 → check_msdefender-1.2.4}/check_msdefender/__init__.py

@@ -1,4 +1,4 @@
 """Check Microsoft Defender API endpoints and check values - Nagios plugin."""
-__version__ = "1.2.1"
+__version__ = "1.2.4"
 __author__ = "ldvchosal"
 __email__ = "ldvchosa@github.com"

{check_msdefender-1.2.1 → check_msdefender-1.2.4}/check_msdefender/core/defender.py

@@ -225,14 +225,14 @@ class DefenderClient:
 
         token = self._get_token()
 
-        # Use the TVM API endpoint for vulnerabilities by machine
-        url = f"{self.base_url}/api/vulnerabilities/machinesVulnerabilities"
+        # Use the TVM API endpoint for products
+        url = f"{self.base_url}/api/machines/SoftwareVulnerabilitiesByMachine"
         headers = {
             "Authorization": f"Bearer {token}",
             "Content-Type": DefenderClient.application_json,
         }
 
-        params = {"$top": "10000"}
+        params = {"pageIndex": "1", "pageSize": "50000"}
 
         try:
             start_time = time.time()

check_msdefender-1.2.4/check_msdefender/integration.py

@@ -0,0 +1,81 @@
+"""Integration test runner for check_msdefender commands."""
+
+import configparser
+import subprocess
+import sys
+from pathlib import Path
+
+
+def find_config() -> Path:
+    """Find the configuration file."""
+    # Check common locations
+    locations = [
+        Path("check_msdefender.ini"),
+        Path.home() / ".check_msdefender.ini",
+        Path("/etc/check_msdefender.ini"),
+    ]
+    for loc in locations:
+        if loc.exists():
+            return loc
+    raise FileNotFoundError("Configuration file not found")
+
+
+def main() -> int:
+    """Run all check_msdefender commands."""
+    try:
+        config_path = find_config()
+    except FileNotFoundError as e:
+        print(f"Error: {e}")
+        return 1
+
+    config = configparser.ConfigParser()
+    config.read(config_path)
+
+    machine = config.get("integration", "machine", fallback=None)
+    if not machine:
+        print("Error: No machine configured in [integration] section")
+        return 1
+
+    print(f"Running integration tests with machine: {machine}")
+    print(f"Config: {config_path}")
+    print("=" * 60)
+
+    # Commands that don't need -d flag
+    commands_no_machine = [
+        ["check_msdefender", "machines"],
+    ]
+
+    # Commands that need -d flag
+    commands_with_machine = [
+        ["check_msdefender", "alerts", "-d", machine],
+        ["check_msdefender", "detail", "-d", machine],
+        ["check_msdefender", "lastseen", "-d", machine],
+        ["check_msdefender", "onboarding", "-d", machine],
+        ["check_msdefender", "products", "-d", machine],
+        ["check_msdefender", "vulnerabilities", "-d", machine],
+    ]
+
+    all_commands = commands_no_machine + commands_with_machine
+    results = []
+
+    for cmd in all_commands:
+        cmd_str = " ".join(cmd)
+        print(f"\n>>> {cmd_str}")
+        print("-" * 60)
+
+        result = subprocess.run(cmd, capture_output=False)
+        results.append((cmd_str, result.returncode))
+
+    print("\n" + "=" * 60)
+    print("Summary:")
+    print("=" * 60)
+
+    for cmd_str, returncode in results:
+        status = "OK" if returncode == 0 else f"EXIT {returncode}"
+        print(f"  [{status:8}] {cmd_str}")
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

{check_msdefender-1.2.1 → check_msdefender-1.2.4}/check_msdefender/services/products_service.py

@@ -54,7 +54,7 @@ class ProductsService:
         products_data = self.defender.get_products()
         all_products = products_data.get("value", [])
         products = [
-            product for product in all_products if product.get("machineId") == target_machine_id
+            product for product in all_products if product.get("deviceId") == target_machine_id
         ]
 
         self.logger.info(f"Found {len(products)} vulnerabilities for machine {target_dns_name}")
@@ -62,14 +62,14 @@ class ProductsService:
         # Group vulnerabilities by software
         software_vulnerabilities = {}
         for vulnerability in products:
-            software_name = vulnerability.get("productName", "Unknown")
-            software_version = vulnerability.get("productVersion", "Unknown")
-            software_vendor = vulnerability.get("productVendor", "Unknown")
+            software_name = vulnerability.get("softwareName", "Unknown")
+            software_version = vulnerability.get("softwareVersion", "Unknown")
+            software_vendor = vulnerability.get("softwareVendor", "Unknown")
             cve_id = vulnerability.get("cveId", "Unknown")
             cvss_score = vulnerability.get("cvssScore", 0)
             disk_paths = vulnerability.get("diskPaths", [])
             registry_paths = vulnerability.get("registryPaths", [])
-            severity = vulnerability.get("severity", "Unknown")
+            severity = vulnerability.get("vulnerabilitySeverityLevel", "Unknown")
 
             software_key = f"{software_name}-{software_version}-{software_vendor}"
 
@@ -101,7 +101,7 @@ class ProductsService:
         low_count = 0
 
         for vulnerability in products:
-            severityLevel = vulnerability.get("severity", "Unknown")
+            severityLevel = vulnerability.get("vulnerabilitySeverityLevel", "Unknown")
             severity = (severityLevel or "Unknown").lower()
             if severity == "critical":
                 critical_count += 1

{check_msdefender-1.2.1 → check_msdefender-1.2.4}/pyproject.toml

@@ -39,7 +39,7 @@ dependencies = [
     "azure-identity>=1.12.0",
     "click>=8.0,<9.0",
 ]
-version = "1.2.1"
+version = "1.2.4"
 
 [project.license]
 text = "MIT"
@@ -52,23 +52,51 @@ Documentation = "https://github.com/lduchosal/check_msdefender/blob/main/README.
 
 [project.scripts]
 check_msdefender = "check_msdefender.cli:main"
+check_msdefender_integration = "check_msdefender.integration:main"
 
-[tool.pdm]
-distribution = true
+[tool.setuptools.package-data]
+"*" = [
+    "*.ini",
+]
 
-[tool.pdm.dev-dependencies]
-dev = [
-    "pytest>=6.0",
-    "pytest-cov>=2.0",
-    "pytest-asyncio>=1.0",
-    "black>=21.0",
-    "flake8>=3.8",
-    "mypy>=0.800",
-    "twine>=6.2.0",
-    "pdm>=2.0.0",
-    "ruff>=0.13.0",
-    "pdm-bump",
+[tool.black]
+line-length = 100
+target-version = [
+    "py310",
+]
+
+[tool.mypy]
+python_version = "3.10"
+warn_return_any = true
+warn_unused_configs = true
+disallow_untyped_defs = true
+disallow_incomplete_defs = true
+check_untyped_defs = true
+disallow_untyped_decorators = false
+no_implicit_optional = true
+warn_redundant_casts = true
+warn_unused_ignores = true
+warn_no_return = true
+warn_unreachable = true
+strict_equality = true
+ignore_missing_imports = true
+
+[tool.pytest.ini_options]
+testpaths = [
+    "tests",
 ]
+python_files = "test_*.py"
+python_classes = "Test*"
+python_functions = "test_*"
+addopts = "-v"
+
+[tool.pdm-bump]
+version-files = [
+    "check_msdefender/__init__.py:__version__",
+]
+
+[tool.pdm]
+distribution = true
 
 [tool.pdm.version]
 source = "file"
@@ -121,43 +149,17 @@ composite = [
     "cli",
 ]
 
-[tool.setuptools.package-data]
-"*" = [
-    "*.ini",
-]
-
-[tool.black]
-line-length = 100
-target-version = [
-    "py310",
-]
-
-[tool.mypy]
-python_version = "3.10"
-warn_return_any = true
-warn_unused_configs = true
-disallow_untyped_defs = true
-disallow_incomplete_defs = true
-check_untyped_defs = true
-disallow_untyped_decorators = false
-no_implicit_optional = true
-warn_redundant_casts = true
-warn_unused_ignores = true
-warn_no_return = true
-warn_unreachable = true
-strict_equality = true
-ignore_missing_imports = true
-
-[tool.pytest.ini_options]
-testpaths = [
-    "tests",
-]
-python_files = "test_*.py"
-python_classes = "Test*"
-python_functions = "test_*"
-addopts = "-v"
-
-[tool.pdm-bump]
-version-files = [
-    "check_msdefender/__init__.py:__version__",
+[dependency-groups]
+dev = [
+    "pytest>=6.0",
+    "pytest-cov>=2.0",
+    "pytest-asyncio>=1.0",
+    "black>=21.0",
+    "flake8>=3.8",
+    "mypy>=0.800",
+    "twine>=6.2.0",
+    "pdm>=2.0.0",
+    "ruff>=0.13.0",
+    "pdm-bump",
+    "types-requests>=2.32.4.20260107",
 ]