check-msdefender 1.1.16__py3-none-any.whl → 1.2.1__py3-none-any.whl

check_msdefender/__init__.py

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

check_msdefender/core/defender.py

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

check_msdefender/services/machines_service.py

@@ -40,13 +40,13 @@ class MachinesService:
 
         # Liat machines
         # Define the sort order
-        status_priority = {"Onboarded": 1, "InsufficientInfo": 2, "Unsupported": 3}
+        status_priority = {"Onboarded": 1, "InsufficientInfo": 2, "Unsupported": 3, "CanBeOnboarded": 4}
 
-        # Sort by priority
+        # Sort by priority (unknown statuses get priority 99)
         sorted_machines = sorted(
             machines,
             key=lambda x: (
-                status_priority[x["onboardingStatus"] or ""],
+                status_priority.get(x["onboardingStatus"] or "", 99),
                 x["computerDnsName"] or "",
             ),
         )

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("deviceId") == target_machine_id
+            product for product in all_products if product.get("machineId") == 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("softwareName", "Unknown")
-            software_version = vulnerability.get("softwareVersion", "Unknown")
-            software_vendor = vulnerability.get("softwareVendor", "Unknown")
+            software_name = vulnerability.get("productName", "Unknown")
+            software_version = vulnerability.get("productVersion", "Unknown")
+            software_vendor = vulnerability.get("productVendor", "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("vulnerabilitySeverityLevel", "Unknown")
+            severity = vulnerability.get("severity", "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("vulnerabilitySeverityLevel", "Unknown")
+            severityLevel = vulnerability.get("severity", "Unknown")
             severity = (severityLevel or "Unknown").lower()
             if severity == "critical":
                 critical_count += 1

{check_msdefender-1.1.16.dist-info → check_msdefender-1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: check-msdefender
-Version: 1.1.16
+Version: 1.2.1
 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.1.16.dist-info → check_msdefender-1.2.1.dist-info}/RECORD

@@ -1,8 +1,8 @@
-check_msdefender-1.1.16.dist-info/METADATA,sha256=bBTyWLUW7Q4aHvjUW3ju0a8QVOiBsbTygSc_WwQWM1c,14853
-check_msdefender-1.1.16.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
-check_msdefender-1.1.16.dist-info/entry_points.txt,sha256=OqVzHI1PaD9V22g0K7BhA2nYv4O-pH8mcLzuGdsk5rM,79
-check_msdefender-1.1.16.dist-info/licenses/LICENSE,sha256=kW3DwIsKc9HVYdS4f4tI6sLo-EPqBQbz-WmuvHU4Nak,1065
-check_msdefender/__init__.py,sha256=xFHBr_kCxF33YVg7-9vG-qPcLuU4vmT2OkeTf_8OnDg,161
+check_msdefender-1.2.1.dist-info/METADATA,sha256=d1GsyosYFST-LKdTcf1_Kfoan2lVcO7wH-lTpFKVlAE,14852
+check_msdefender-1.2.1.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
+check_msdefender-1.2.1.dist-info/entry_points.txt,sha256=OqVzHI1PaD9V22g0K7BhA2nYv4O-pH8mcLzuGdsk5rM,79
+check_msdefender-1.2.1.dist-info/licenses/LICENSE,sha256=kW3DwIsKc9HVYdS4f4tI6sLo-EPqBQbz-WmuvHU4Nak,1065
+check_msdefender/__init__.py,sha256=LO9bjNejm0Yz3BtvvopcVFFiuP1R4Mdurk89jQag6i4,160
 check_msdefender/__main__.py,sha256=TuNsRSdnkQm9OdBTAwD5aB2zV_Irc50WgylVWhrfnLY,124
 check_msdefender/check_msdefender.py,sha256=OO4Tg2DBW28AT-2LOH-qJM2pE5TPcF615BF7HjyZsmA,137
 check_msdefender/cli/__init__.py,sha256=NWaS5ZI9_252AcReugF_WGPMOvQ_B7sC_s3pSrGujcI,291
@@ -20,7 +20,7 @@ check_msdefender/cli/handlers.py,sha256=hp_CX_3qPoQGrPPVeiojb2j7tuFMva4ebWg9CxVU
 check_msdefender/core/__init__.py,sha256=naBiEkixiWTuHU3GENk8fqC8H3p_hkzRsmSY2uiM_TQ,47
 check_msdefender/core/auth.py,sha256=7mkGmhGHy4t38O0e4Rz7dQ52xfMbK3IUXMlw3u83aB4,1585
 check_msdefender/core/config.py,sha256=IoWBL_DB110F4i6hFfli6iFDBXx57dHh32lCuLkcgNk,1170
-check_msdefender/core/defender.py,sha256=JChnsyKD2grSMlxSDHEbTd4Al8pW-_8TAN8-1JsINR4,10389
+check_msdefender/core/defender.py,sha256=OyVrI2nEng95eSdDke8aCdL3wODZpRpJfroEQONBCT0,10383
 check_msdefender/core/exceptions.py,sha256=X4s_XM64SEVSs-4mGKqnF8xXwGFY3E0buvkgRNuCCX4,600
 check_msdefender/core/logging_config.py,sha256=Rd1F-IDXTx7yckrI8kyx2Ht20f5OcArPCAXb44BOmbg,4084
 check_msdefender/core/nagios.py,sha256=FmwWZbJHdLDR8Ah0ejt5wj7jNWC6YHbeE5YMyKLSCQA,6303
@@ -28,9 +28,9 @@ check_msdefender/services/__init__.py,sha256=_fiKXxcz263IghXn9BnUWDKPgedhUPoSakE
 check_msdefender/services/alerts_service.py,sha256=poKZw1WKphmtPPnuMDrGRuPQbRLjLDZpo2rhFCh7TDc,4034
 check_msdefender/services/detail_service.py,sha256=tXfb6H2dhrTZ5y85H8W58GA8CvA-7aUwMIbNdcqECw0,3381
 check_msdefender/services/lastseen_service.py,sha256=LiNVeUbAoMzowMvE90P7zCtKFHBLbIDp5mmkVHRLwqs,3128
-check_msdefender/services/machines_service.py,sha256=KLRwltpYtwg_qtW6BGIxlH-PB9LcnEyW-i3C4RGSD30,3238
+check_msdefender/services/machines_service.py,sha256=xnvka5h_WQxpYHSZQkrJLEYcw7I-zvan0xUrUXeOyIo,3302
 check_msdefender/services/models.py,sha256=CDmQ5vU0-GawIalqXjXNk3rry6gsyjv6eSlW2NiXwQ0,979
 check_msdefender/services/onboarding_service.py,sha256=RIOsvALCoKV0YqnCHKYRkelSPrO-F-6vNBLlto4MpiI,2686
-check_msdefender/services/products_service.py,sha256=V8aEaY6cfTfOTMZq8dEIvgxYKxecj7p2hu6YsdG79Ro,9191
+check_msdefender/services/products_service.py,sha256=9ezHS6yc3gvYHQBQEif947q_EnOlPx3_QCPY1urMILc,9153
 check_msdefender/services/vulnerabilities_service.py,sha256=LuRRQlFt-K82tGUhLCx_QCOp4CbBgSp7fktmeSSoa9o,6838
-check_msdefender-1.1.16.dist-info/RECORD,,
+check_msdefender-1.2.1.dist-info/RECORD,,