chg: [parser] unify with parse_path function

parsers/accessibility_tcc.py

@@ -9,6 +9,7 @@
 import glob
 import os
 import sys
+import misc
 
 version_string = "sysdiagnose-Accessibility-TCC.py v2020-20-20 Version 1.0"
 
@@ -34,10 +35,12 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return misc.json_serializable(sqlite2json.sqlite2struct(path))
+
+
 def get_accessibility_tcc(dbpath, ios_version=13):
-    tcc = sqlite2json.sqlite2struct(dbpath)
-    return tcc
-    # return sqlite2json.dump2json(tcc)
+    return parse_path(dbpath)
 
 
 def print_accessibility_tcc(inputfile):

parsers/appinstallation.py

@@ -17,6 +17,8 @@
 import os
 import sqlite3
 import sys
+import misc
+
 
 version_string = "sysdiagnose-appinstallation.py v2019-11-22 Version 2.0"
 
@@ -43,6 +45,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return misc.json_serializable(sqlite2json.sqlite2struct(path))
+
+
 def get_appinstallation(dbpath, ios_version=13):
     # FIXME result can contain data in binary form. Apply the misc.json_serializable function to convert it to clean JSON.
     if ios_version < 13:

parsers/brctl.py

@@ -39,6 +39,10 @@ def get_log_files(log_root_path: str) -> list:
     return [os.path.join(log_root_path, log_folder) for log_folder in log_folders]
 
 
+def parse_path(path: str) -> list | dict:
+    return parsebrctl(path)
+
+
 def parselistfile(container_list_file):
     containers = {"containers": []}
     result = []

parsers/containermanager.py

@@ -43,6 +43,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return multilinelog.extract_from_file(path)
+
+
 def parsecontainermanager(loglist):
     for logfile in loglist:
         return multilinelog.extract_from_file(logfile)

parsers/demo_parser.py

@@ -7,6 +7,7 @@
 import sys
 from optparse import OptionParser
 import os
+import json
 
 version_string = "sysdiagnose-demo-parser.py v2023-04-26 Version 1.0"
 
@@ -32,6 +33,28 @@ def get_log_files(log_root_path: str) -> list:
     return [os.path.join(log_root_path, log_files) for log_files in log_files]
 
 
+def parse_path(path: str) -> list | dict:
+    '''
+        this is the function that will be called
+    '''
+    json_object = {}
+    return json_object
+
+
+def parse_path_to_folder(path: str, output: str) -> bool:
+    '''
+        this is the function that will be called
+    '''
+    try:
+        json_object = {}
+        with open(os.path.join(output, "demo_output.json"), "w") as f:
+            json.dump(json_object, f)
+        return True
+    except Exception as e:
+        print(f"Error: {e}")
+        return False
+
+
 def demo_function(filepath, ios_version=16, output=None):
     """
         This is the function that will be called

parsers/itunesstore.py

@@ -10,7 +10,7 @@
 import json
 import os
 import sys
-
+import misc
 
 version_string = "sysdiagnose-itunesstore.py v2020-20-19 Version 1.0"
 
@@ -37,6 +37,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return misc.json_serializable(sqlite2json.sqlite2struct(path))
+
+
 def get_itunesstore(dbpath, ios_version=13):
     itunes = sqlite2json.sqlite2struct(dbpath)
     return json.loads(sqlite2json.dump2json(itunes))

parsers/logarchive.py

@@ -54,6 +54,9 @@ def get_logs(filename, ios_version=13, output=None):        # FIXME #18 hard cod
         Parse the system_logs.logarchive.  When running on OS X, use native tools.
         On other system use a 3rd party library.
     """
+    if output is not None:
+        output = os.path.join(output, "logarchive")
+        os.makedirs(output, exist_ok=True)
     if (platform.system() == "Darwin"):
         if output is not None:
             output = os.path.join(output, "logarchive.json")
@@ -65,6 +68,20 @@ def get_logs(filename, ios_version=13, output=None):        # FIXME #18 hard cod
     return None
 
 
+def parse_path(path: str) -> list | dict:
+    return get_logs(path, output=None)
+
+
+def parse_path_to_folder(path: str, output: str) -> bool:
+    result = get_logs(path, output=output)
+    if len(result['data']) > 0:
+        return True
+    else:
+        print("Error:")
+        print(json.dumps(result, indent=4))
+        return False
+
+
 def get_logs_on_osx(filename, output):
     cmd_line = cmd_parsing_osx % (filename)
     return __execute_cmd_and_get_result(cmd_line, output)

parsers/mobileactivation.py

@@ -43,6 +43,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return multilinelog.extract_from_file(path)
+
+
 def parsemobactiv(loglist):
     for logfile in loglist:
         return multilinelog.extract_from_file(logfile)

parsers/mobileinstallation.py

@@ -43,6 +43,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return multilinelog.extract_from_file(path)
+
+
 def parsemobinstall(loglist):
     events = {"events": []}
     for logfile in loglist:

parsers/networkextension.py

@@ -48,6 +48,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return misc.load_plist_file_as_json(path)
+
+
 def parseplist(fname):
     return misc.load_plist_file_as_json(fname)
 

parsers/networkextensioncache.py

@@ -44,6 +44,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return misc.load_plist_file_as_json(path)
+
+
 def parseplist(fname):
     pl = misc.load_plist_file_as_json(fname)
 

parsers/olddsc.py

@@ -36,6 +36,10 @@ def get_log_files(log_root_path: str) -> dict:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return misc.load_plist_file_as_json(path)
+
+
 def parse_olddsc_file(filepath: str) -> dict:
     return misc.load_plist_file_as_json(filepath)
 

parsers/powerlogs.py

@@ -40,6 +40,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return sqlite2json.sqlite2struct(path)
+
+
 def get_powerlogs(dbpath, ios_version=13):
 
     powerlogs = sqlite2json.sqlite2struct(dbpath)

parsers/ps.py

@@ -41,6 +41,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return parse_ps(path)
+
+
 def parse_ps(filename, ios_version=16):
     processes = {}
     try:

parsers/psthread.py

@@ -38,6 +38,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return parse_ps_thread(path)
+
+
 def parse_ps_thread(filename, ios_version=13):
     with open(filename, "r") as fd:
         input = fd.readlines()

parsers/shutdownlogs.py

@@ -39,6 +39,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return parse_shutdownlog(path)
+
+
 def parse_shutdownlog(filepath, ios_version=16):
     """
         This is the function that will be called

parsers/spindumpnosymbols.py

@@ -45,6 +45,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return parsespindumpNS(path)
+
+
 def parsespindumpNS(file):
     with open(file, 'r') as f_in:
         # init section

parsers/swcutil.py

@@ -42,6 +42,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return parseswcutil(path)
+
+
 def parseswcutil(file):
     with open(file, 'r') as f_in:
         # init section

parsers/sys.py

@@ -35,6 +35,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return getProductInfo(path)
+
+
 # --------------------------------------------------------------------------- #
 # XXX FIXME: this is obviously a very generic function and could be generalized and moved to misc/
 

parsers/taskinfo.py

@@ -36,6 +36,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return get_tasks(path)
+
+
 # --------------------------------------------------------------------------- #
 def get_num_tasks(filename, ios_version=13):
     """

parsers/uuid2path.py

@@ -9,7 +9,6 @@
 
 import sys
 import json
-import pprint
 import plistlib
 from optparse import OptionParser
 

parsers/wifi_known_networks.py

@@ -46,6 +46,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return misc.load_plist_file_as_json(path)
+
+
 # --------------------------------------------------------------------------- #
 # XXX #26 FIXME: this is obviously a very generic function and could be generalized and moved to misc/
 

parsers/wifiscan.py

@@ -38,6 +38,10 @@ def get_log_files(log_root_path: str) -> list:
     return log_files
 
 
+def parse_path(path: str) -> list | dict:
+    return parsewifiscan([path])
+
+
 def parsewifiscan(wifi_data: list):
     output = []
     for data in wifi_data:

parsers/wifisecurity.py

@@ -31,6 +31,10 @@ def get_log_files(log_root_path: str) -> list:
     return [os.path.join(log_root_path, log_files) for log_files in log_files]
 
 
+def parse_path(path: str) -> list | dict:
+    return get_wifi_security_log(path)
+
+
 def get_wifi_security_log(filepath, ios_version=16):
     """
         Parse ./WiFi/security.txt and extract block of interest:

tests/test_parsers_accessibility_tcc.py

@@ -1,4 +1,4 @@
-from parsers.accessibility_tcc import get_accessibility_tcc, get_log_files
+from parsers.accessibility_tcc import parse_path, get_log_files
 from tests import SysdiagnoseTestCase
 import unittest
 
@@ -10,7 +10,7 @@ def test_get_accessibility_tcc(self):
             files = get_log_files(log_root_path)
             for file in files:
                 print(f'Parsing {file}')
-                result = get_accessibility_tcc(file)
+                result = parse_path(file)
                 self.assertTrue('admin' in result)
                 self.assertTrue('policies' in result)
                 self.assertTrue('active_policy' in result)

tests/test_parsers_appinstallation.py

@@ -1,4 +1,4 @@
-from parsers.appinstallation import get_appinstallation, get_log_files
+from parsers.appinstallation import parse_path, get_log_files
 from tests import SysdiagnoseTestCase
 import unittest
 
@@ -10,7 +10,7 @@ def test_get_appinstallation(self):
             files = get_log_files(log_root_path)
             for file in files:
                 print(f'Parsing {file}')
-                result = get_appinstallation(file)
+                result = parse_path(file)
                 self.assertTrue('application' in result)
                 self.assertTrue('asset' in result)
                 self.assertTrue('client' in result)

tests/test_parsers_brctl.py

@@ -1,4 +1,4 @@
-from parsers.brctl import parsebrctl, get_log_files
+from parsers.brctl import parse_path, get_log_files
 from tests import SysdiagnoseTestCase
 import unittest
 
@@ -10,7 +10,7 @@ def test_parsebrctl(self):
             folders = get_log_files(log_root_path)
             for folder in folders:
                 print(f'Parsing {folder}')
-                result = parsebrctl(folder)
+                result = parse_path(folder)
                 if result:
                     self.assertTrue('containers' in result)
                     self.assertTrue('boot_history' in result)

tests/test_parsers_containermanager.py

@@ -1,4 +1,4 @@
-from parsers.containermanager import parsecontainermanager, get_log_files
+from parsers.containermanager import parse_path, get_log_files
 from tests import SysdiagnoseTestCase
 import unittest
 
@@ -10,7 +10,7 @@ def test_parsecontainermanager(self):
             files = get_log_files(log_root_path)
             for file in files:
                 print(f'Parsing {file}')
-                result = parsecontainermanager([file])
+                result = parse_path(file)
                 for item in result['events']:
                     self.assertTrue('timestamp' in item)
                     self.assertTrue('loglevel' in item)