fix: [remotectl_dumpstate] fixes #114 parsing issue

EC-DIGIT-CSIRC · Nov 6, 2024 · 84e9cd6 · 84e9cd6
1 parent 74f0539
commit 84e9cd6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/sysdiagnose/utils/tabbasedhierarchy.py b/src/sysdiagnose/utils/tabbasedhierarchy.py
@@ -14,7 +14,7 @@ def parse_block(lines: list) -> list | dict:
     n = 0
     while n < len(lines):
         line = lines[n]
-        if line.strip() == '}' or line.strip() == '':
+        if line.strip() == '}' or line.strip() == '' or line.strip() == ']':
             n = n + 1
             continue
         # subsection if next line is more indented  (more tabs at start of line)
@@ -26,7 +26,10 @@ def parse_block(lines: list) -> list | dict:
         if next_depth > current_depth:
             # subsection
             # extract key
-            key = line.replace(':', '').replace('{', '').strip()
+            if '=>' in line:
+                key = line.split('=>')[0].strip()
+            else:
+                key = line.replace(':', '').replace('{', '').strip()
             # identify end of subsection and call recursive parsing function with that block
             extracted_block = []
             while next_depth > current_depth:

diff --git a/tests/test_tabbasedhierarchy.py b/tests/test_tabbasedhierarchy.py
@@ -29,6 +29,10 @@ def test_remotectldumpstateblock(self):
             '	Properties: {',
             '		AppleInternal => false',
             '		CPUArchitecture => x86_64h',
+            '		EncryptedRemoteXPCPopulatedOIDs => [<capacity = 2>',
+            '			0: 1.2.840.113635.100.6.83',
+            '			1: 1.2.840.113635.100.6.84',
+            '		]',
             '	}',
             '	Services:',
             '		com.apple.osanalytics.logRelay',
@@ -68,7 +72,11 @@ def test_remotectldumpstateblock(self):
                 ],
                 "Properties": {
                     "AppleInternal": "false",
-                    "CPUArchitecture": "x86_64h"
+                    "CPUArchitecture": "x86_64h",
+                    "EncryptedRemoteXPCPopulatedOIDs": {
+                        "0": "1.2.840.113635.100.6.83",
+                        "1": "1.2.840.113635.100.6.84"
+                    }
                 },
                 "Services": {
                     "com.apple.osanalytics.logRelay": {