Fixed bugs in unused functions, rem unused dep

hbcbh1999 · Aug 1, 2021 · 7e4cbc3 · 7e4cbc3
1 parent 82c3ec3
commit 7e4cbc3
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 15 deletions.
diff --git a/plugins/applist.py b/plugins/applist.py
@@ -88,7 +88,7 @@ def Plugin_Start(mac_info):
                 if deserialized_plist:
                     parse_appList_plist(deserialized_plist, apps, user_name, source_path)
             else:
-                log.error('Could not open file {}'.format(path))
+                log.error('Could not open file {}'.format(source_path))
 
     if len(apps) > 0:
         PrintAll(apps, mac_info.output_params, '')

diff --git a/plugins/domains.py b/plugins/domains.py
@@ -80,7 +80,7 @@ def Plugin_Start_Standalone(input_files_list, output_params):
         success, plist, error = CommonFunctions.ReadPlist(input_path)
         if success:
             ProcessActiveDirectoryPlist(input_path, plist)
-            WriteList('domain details', 'Domain_ActiveDirectory', ad_details, ad_info, mac_info.output_params, input_path)
+            WriteList('domain details', 'Domain_ActiveDirectory', ad_details, ad_info, output_params, input_path)
         else:
             log.error("Failed to read plist " + input_path + " Error was: " + error)
 

diff --git a/plugins/helpers/aff4_helper.py b/plugins/helpers/aff4_helper.py
@@ -43,7 +43,7 @@ def get_sha1_hash(self):
 
         while data:
             hasher.update(data)
-            data = img.read(unit)
+            data = self.read(unit)
             if data:
                 pos += len(data)
                 print(f'Read {pos/(1024*1024)} MB, {pos} bytes')

diff --git a/plugins/helpers/darwin_path_generator.py b/plugins/helpers/darwin_path_generator.py
@@ -23,6 +23,7 @@
 #                under /var/folders/
 #
 
+import struct
 
 def GetDarwinPath(uuid, uid):
     '''Returns DARWIN_USER_FOLDER path constructed from UUID and UID for 

diff --git a/plugins/helpers/hfs_alt.py b/plugins/helpers/hfs_alt.py
@@ -321,7 +321,7 @@ def getXattrsByPath(self, path):
 
     def getXattrByPath(self, path, name):
         file_id = self.getCnidForPath(path)
-        return self.getXattr(fileID, name)
+        return self.getXattr(file_id, name)
 
     '''	Compression type in Xattr as per apple:
         Source: https://opensource.apple.com/source/copyfile/copyfile-138/copyfile.c.auto.html

diff --git a/plugins/helpers/spotlight_parser.py b/plugins/helpers/spotlight_parser.py
@@ -363,7 +363,7 @@ def ParseItem(self, properties, categories, indexes_1, indexes_2):
                                         if len(all_translations) > 2:
                                             log.warning('Encountered more than one control sequence in single translation'
                                                         'string.')
-                                            log.debug('Found this list: {}', other)
+                                            #log.debug('Found this list: {}', other)
                                         value = all_translations[0].decode('utf8', 'backslashreplace')
                                         break # only get first, rest are language variants!
                         elif prop_type & 0x2 == 0x2: #== 0x4A: # ContentTypeTree ItemUserTags

diff --git a/plugins/installhistory.py b/plugins/installhistory.py
@@ -61,7 +61,7 @@ def ReadInstallHistoryPlist(plist, history):
 
 def ParseInstallHistoryFile(input_file):
     history = []
-    success, plist, error = CommonFunctions.ReadPlist(input_path)
+    success, plist, error = CommonFunctions.ReadPlist(input_file)
     if success:
         ReadInstallHistoryPlist(plist, history)
     else:

diff --git a/plugins/networking.py b/plugins/networking.py
@@ -7,7 +7,6 @@
    
 '''
 
-import binascii
 import logging
 import os
 import re

diff --git a/plugins/spotlightshortcuts.py b/plugins/spotlightshortcuts.py
@@ -7,10 +7,7 @@
    
 '''
 
-import os
-import sys
 import logging
-import struct
 
 from plugins.helpers.common import CommonFunctions
 from plugins.helpers.macinfo import *
@@ -38,7 +35,7 @@ def PrintAll(shortcut_items, output_params, source_path):
     WriteList("spotlight shortcut information", "SpotlightShortcuts", shortcut_items, shortcut_info, output_params, source_path)
 
 def ParseShortcutFile(input_file, shortcuts):
-    success, plist, error = CommonFunctions.ReadPlist(input_path)
+    success, plist, error = CommonFunctions.ReadPlist(input_file)
     if success:
         ReadShortcutPlist(plist, shortcuts, input_file)
     else:

diff --git a/plugins/sudo_lastrun.py b/plugins/sudo_lastrun.py
@@ -100,7 +100,7 @@ def Plugin_Start_Standalone(input_files_list, output_params):
     for input_path in input_files_list:
         log.debug("Input file passed was: " + input_path)
         ## Process the input file here ##
-        f = open(file_path)
+        f = open(input_path)
         if f:
             ProcessTsFile(f, os.path.basename(input_path), input_path, os.path.getsize(input_path), sudo_logs)
             f.close()

diff --git a/plugins/term_sessions.py b/plugins/term_sessions.py
@@ -8,7 +8,6 @@
 '''
 
 
-import os
 import binascii
 import logging
 from plugins.helpers.macinfo import *

diff --git a/plugins/users.py b/plugins/users.py
@@ -7,7 +7,6 @@
    
 '''
 
-import os
 import logging
 from plugins.helpers.macinfo import *
 from plugins.helpers.writer import *

diff --git a/plugins/utmpx.py b/plugins/utmpx.py
@@ -14,7 +14,6 @@
 '''
 
 import os
-import sys
 import time
 from construct import *