Force unique service description

Author: CLiX-1

intune/agent_based/ms_intune_apple_vpp_tokens.py

@@ -40,26 +40,22 @@
 
 @dataclass(frozen=True)
 class TokenInfo:
-    token_id: str
     token_appleid: str
-    token_state: str
     token_expiration: str
+    token_id: str
+    token_name: str
+    token_state: str
 
 
 # Example data from special agent:
 # <<<ms_intune_apple_vpp_tokens:sep(0)>>>
 # [
 #     {
-#         "token_id": "00000000-0000-0000-0000-000000000000",
-#         "token_appleid": "vpp@domain.td",
-#         "token_state": "valid",
-#         "token_expiration": "2025-03-02T06:54:05Z"
-#     },
-#     {
-#         "token_id": "00000000-0000-0000-0000-000000000001",
 #         "token_appleid": "vpp@domain.td",
-#         "token_state": "valid",
 #         "token_expiration": "2025-03-02T06:54:05Z"
+#         "token_id": "00000000-0000-0000-0000-000000000000",
+#         "token_name": "valid",
+#         "token_state": "Token 1",
 #     },
 #     ...
 # ]
@@ -69,8 +65,18 @@ class TokenInfo:
 
 def parse_ms_intune_apple_vpp_tokens(string_table: StringTable) -> Section:
     parsed = {}
+    token_names = set()
     for item in json.loads("".join(string_table[0])):
-        parsed[item["token_id"]] = item
+        token_name = item["token_name"]
+        # generate unique names, because token name is not unique
+        if token_name in token_names:
+            token_name_unique = f"{token_name}_{item["token_id"][-4:]}"
+        else:
+            token_name_unique = token_name
+            token_names.add(token_name)
+
+        parsed[token_name_unique] = item
+
     return parsed
 
 
@@ -87,8 +93,10 @@ def check_ms_intune_apple_vpp_tokens(item: str, params: Mapping[str, Any], secti
     params_levels_token_expiration = params.get("token_expiration")
 
     token_appleid = token["token_appleid"]
-    token_state = token["token_state"]
     token_expiration = token["token_expiration"]
+    token_id = token["token_id"]
+    token_name = token["token_name"]
+    token_state = token["token_state"]
 
     token_expiration_datetime = datetime.fromisoformat(token_expiration)
     token_expiration_timestamp = token_expiration_datetime.timestamp()
@@ -98,8 +106,10 @@ def check_ms_intune_apple_vpp_tokens(item: str, params: Mapping[str, Any], secti
 
     result_details = (
         f"Expiration time: {token_expiration_timestamp_render}"
-        f"\\nState: {token_state}"
+        f"\\nToken name: {token_name}"
+        f"\\nToken ID: {token_id}"
         f"\\nApple ID: {token_appleid}"
+        f"\\nState: {token_state}"
     )
     result_summary = f"Expiration time: {token_expiration_timestamp_render}, State: {token_state}"
 
@@ -140,7 +150,7 @@ def check_ms_intune_apple_vpp_tokens(item: str, params: Mapping[str, Any], secti
 
 check_plugin_ms_intune_apple_vpp_tokens = CheckPlugin(
     name="ms_intune_apple_vpp_tokens",
-    service_name="Intune VPP token %s",
+    service_name="Intune Apple VPP token %s",
     discovery_function=discover_ms_intune_apple_vpp_tokens,
     check_function=check_ms_intune_apple_vpp_tokens,
     check_ruleset_name="ms_intune_apple_vpp_tokens",

intune/agent_based/ms_intune_cert_connectors.py

@@ -39,8 +39,9 @@
 @dataclass(frozen=True)
 class ConnectorInfo:
     connector_connection_last: str
-    connector_state: str
+    connector_id: str
     connector_name: str
+    connector_state: str
     connector_version: str
 
 
@@ -51,14 +52,9 @@ class ConnectorInfo:
 # [
 #     {
 #         "connector_connection_last": "2024-05-18T21:33:26.1092739Z",
-#         "connector_state": "active",
+#         "connector_id": "00000000-0000-0000-0000-000000000000",
 #         "connector_name": "Connector1",
-#         "connector_version": "6.2301.1.0"
-#     },
-#     {
-#         "connector_connection_last": "2024-05-18T21:29:30.5308288Z",
 #         "connector_state": "active",
-#         "connector_name": "Connector2",
 #         "connector_version": "6.2301.1.0"
 #     },
 #     ...
@@ -67,8 +63,18 @@ class ConnectorInfo:
 
 def parse_ms_intune_cert_connectors(string_table: StringTable) -> Section:
     parsed = {}
+    connector_names = set()
     for item in json.loads("".join(string_table[0])):
-        parsed[item["connector_name"]] = item
+        connector_name = item["connector_name"]
+        # generate unique names, because connector name is not unique
+        if connector_name in connector_names:
+            connector_name_unique = f"{connector_name}_{item["connector_id"][-4:]}"
+        else:
+            connector_name_unique = connector_name
+            connector_names.add(connector_name)
+
+        parsed[connector_name_unique] = item
+
     return parsed
 
 
@@ -83,6 +89,8 @@ def check_ms_intune_cert_connectors(item: str, section: Section) -> CheckResult:
         return
 
     connector_connection_last = connector["connector_connection_last"]
+    connector_id = connector["connector_id"]
+    connector_name = connector["connector_name"]
     connector_state = connector["connector_state"]
     connector_version = connector["connector_version"]
 
@@ -93,9 +101,11 @@ def check_ms_intune_cert_connectors(item: str, section: Section) -> CheckResult:
     result_summary = f"State: {connector_state}"
 
     result_details = (
-        f"State: {connector_state}"
-        f"\\nLast connected: {connector_connection_last_timestamp_render}"
+        f"Connector name: {connector_name}"
+        f"\\nConnector ID: {connector_id}"
         f"\\nConnector version: {connector_version}"
+        f"\\nLast connected: {connector_connection_last_timestamp_render}"
+        f"\\nState: {connector_state}"
     )
 
     if connector_state != "active":