Fixed major bugs that affect Logicytics (performance checker), plus QoL changes

Logicytics.py
    Fixed bug [ValueError String Formatting], where the memory was not a proper string if an application runs into an error
    Thanks to new changes, `Get.list_of_files` now ignores the `logicytics` folder and `, SysInternal_Suite` folder, which resulted in bugs when executed and crashes
    Added debug log to get length of execution list
    Hard limited memory changes (in performance checker) to be at minimum 0 (Logging will still show you the warning), this is to exclude the edge cases where freed memory is more than used memory
    Improved logging of `performance check` where messages are more in detail and memory is now in 3dp rather than 2dp
    Added try-except statements to prevent crashes if code fails (performance checker)
    Made function `zip_generated_files()` into a class `ZIP`, with the main and helper function in it

Get.py
    Fixed bug in execution list where it included the `logicytics` library, which led to them being run, thus errors, adding new param: `exclude_dirs`

Flag.py
    Fixed bug where CONFIG wasn't importing due to improper import statement (`from .Config import CONFIG` is now `from logicytics.Config import CONFIG`)

network_psutil.py
    Fixed bug where __measure_network_bandwidth_usage wasn't run due to faulty async-await code, now fixed by making `get` and async function, and awaits `__measure_network_bandwidth_usage`
    Improved error logging to prevent crashes.

Also, gitignore now ignore the exe files that are zipped when they are unzipped (`SysInternal suite`), Thus developers don't accidentally commit them

Signed-off-by: Shahm Najeeb <Nirt_12023@outlook.com>

Author: DefinetlyNotAI

.gitignore

@@ -322,3 +322,9 @@ $RECYCLE.BIN/
 /CODE/VulnScan/tools/NN features/
 /CODE/logicytics/User_History.json.gz
 /CODE/logicytics/User_History.json
+/CODE/SysInternal_Suite/psfile.exe
+/CODE/SysInternal_Suite/PsGetsid.exe
+/CODE/SysInternal_Suite/PsInfo.exe
+/CODE/SysInternal_Suite/pslist.exe
+/CODE/SysInternal_Suite/PsLoggedon.exe
+/CODE/SysInternal_Suite/psloglist.exe

CODE/Logicytics.py

@@ -67,7 +67,8 @@ def __generate_execution_list(self) -> list[str]:
             - Warns users about potential long execution times for certain actions
         """
         execution_list = Get.list_of_files(".", only_extensions=(".py", ".exe", ".ps1", ".bat"),
-                                           exclude_files=["Logicytics.py"])
+                                           exclude_files=["Logicytics.py"],
+                                           exclude_dirs=["logicytics", "SysInternal_Suite"])
         files_to_remove = {
             "sensitive_data_miner.py",
             "dir_list.py",
@@ -101,7 +102,8 @@ def __generate_execution_list(self) -> list[str]:
         elif ACTION == "modded":
             # Add all files in MODS to execution list
             execution_list = Get.list_of_files("../MODS", only_extensions=(".py", ".exe", ".ps1", ".bat"),
-                                               append_file_list=execution_list, exclude_files=["Logicytics.py"])
+                                               append_file_list=execution_list, exclude_files=["Logicytics.py"],
+                                               exclude_dirs=["logicytics", "SysInternal_Suite"])
 
         elif ACTION == "depth":
             log.warning(
@@ -128,6 +130,7 @@ def __generate_execution_list(self) -> list[str]:
             log.critical("Nothing is in the execution list.. This is due to faulty code or corrupted Logicytics files!")
             exit(1)
 
+        log.debug(f"Execution list length: {len(execution_list)}")
         log.debug(f"The following will be executed: {execution_list}")
         return execution_list
 
@@ -208,18 +211,32 @@ def __performance(self):
             end_time = datetime.now()
             end_memory = process.memory_full_info().uss / 1024 / 1024  # MB
             elapsed_time = end_time - start_time
-            memory_delta = end_memory - start_memory
-            memory_usage.append((self.execution_list[file], str(memory_delta)))
+            memory_delta = max(0, end_memory - start_memory)  # Clamps negative delta to 0
+            memory_usage.append((self.execution_list[file], f"{memory_delta}"))
             execution_times.append((self.execution_list[file], elapsed_time))
             log.info(f"{self.execution_list[file]} executed in {elapsed_time}")
-            log.info(f"{self.execution_list[file]} used {memory_delta:.2f}MB of memory")
-            log.debug(f"Started with {start_memory}MB of memory and ended with {end_memory}MB of memory")
+            try:
+                if (end_memory - start_memory) < 0:
+                    log.info(
+                        f"{self.execution_list[file]} used {memory_delta:.3f}MB of memory - \033[33mPossible Affected by outside processes\033[0m")
+                else:
+                    log.info(f"{self.execution_list[file]} used {memory_delta:.3f}MB of memory")
+            except Exception as e:
+                log.warning("Failed to log memory usage delta, reason: " + str(e))
+            log.debug(f"Started with {start_memory:.3f}MB of memory and ended with {end_memory:.3f}MB of memory")
 
         table = PrettyTable()
         table.field_names = ["Script", "Execution Time", "Memory Usage (MB)"]
         for script, elapsed_time in execution_times:
-            memory = next(m[1] for m in memory_usage if m[0] == script)
-            table.add_row([script, elapsed_time, f"{memory:.2f}"])
+            try:
+                memory = f"{float(next(m[1] for m in memory_usage if m[0] == script)):.3f}"
+            except StopIteration:
+                log.warning(f"No memory data found for {script}")
+                memory = "N/A"
+            except Exception as e:
+                log.warning(f"Failed to log memory usage for {script}, reason: " + str(e))
+                memory = "N/A"
+            table.add_row([script, elapsed_time, f"{memory}"])
 
         try:
             with open(
@@ -228,9 +245,9 @@ def __performance(self):
             ) as f:
                 f.write(table.get_string())
                 f.write(
-                    "\nSome values may be negative, Reason may be due to external resources playing with memory usage, "
-                    "close background tasks to get more accurate readings")
-                f.write("Note: This is not a low-level memory logger, data here isn't 100% accurate!")
+                    "\nSome values may be negative, Reason may be due to external resources playing with memory usage,\n"
+                    "Close background tasks to get more accurate readings\n\n")
+                f.write("Note: This is not a low-level memory logger, data here isn't 100% accurate!\n")
             log.info("Performance check complete! Performance log found in ACCESS/LOGS/PERFORMANCE")
         except Exception as e:
             log.error(f"Error writing performance log: {e}")
@@ -434,10 +451,16 @@ def check_privileges():
         log.warning("UAC is enabled, this may cause issues - Please disable UAC if possible")
 
 
-def zip_generated_files():
-    """Zips generated files based on the action."""
+class ZIP:
+    @classmethod
+    def files(cls):
+        """Zips generated files based on the action."""
+        if ACTION == "modded":
+            cls.__and_log("..\\MODS", "MODS")
+        cls.__and_log(".", "CODE")
 
-    def zip_and_log(directory: str, name: str):
+    @staticmethod
+    def __and_log(directory: str, name: str):
         log.debug(f"Zipping directory '{directory}' with name '{name}' under action '{ACTION}'")
         zip_values = FileManagement.Zip.and_hash(
             directory,
@@ -451,10 +474,6 @@ def zip_and_log(directory: str, name: str):
             log.info(zip_loc)
             log.debug(hash_loc)
 
-    if ACTION == "modded":
-        zip_and_log("..\\MODS", "MODS")
-    zip_and_log(".", "CODE")
-
 
 def handle_sub_action():
     """
@@ -472,8 +491,7 @@ def handle_sub_action():
     elif SUB_ACTION == "reboot":
         subprocess.call("shutdown /r /t 3", shell=False)
     # elif sub_action == "webhook":
-    # Implement this in future
-    # log.warning("This feature is not implemented yet! Sorry")
+    # TODO: Implement this in future v3.5
 
 
 @log.function
@@ -501,7 +519,7 @@ def Logicytics():
     # Execute scripts
     ExecuteScript().handler()
     # Zip generated files
-    zip_generated_files()
+    ZIP.files()
     # Finish with sub actions
     handle_sub_action()
     # Finish

CODE/logicytics/Flag.py

@@ -8,7 +8,7 @@
 from collections import Counter
 from datetime import datetime
 
-from .Config import CONFIG
+from logicytics.Config import CONFIG
 
 # Check if the script is being run directly, if not, set up the library
 if __name__ == '__main__':

CODE/logicytics/Get.py

@@ -11,6 +11,7 @@ def list_of_files(
             append_file_list: list[str] = None,
             exclude_files: list[str] = None,
             exclude_extensions: list[str] = None,
+            exclude_dirs: list[str] = None,
     ) -> list[str]:
         """
         Retrieves a list of files in the specified directory based on given extensions and exclusion criteria.
@@ -21,19 +22,25 @@ def list_of_files(
             append_file_list (list[str], optional): Existing list to append found filenames to. Defaults to None.
             exclude_files (list[str], optional): List of filenames to exclude from results. Defaults to None.
             exclude_extensions (list[str], optional): List of extensions to exclude from results. Defaults to None.
+            exclude_dirs (list[str], optional): List of directory names to ignore. Defaults to None.
 
         Returns:
             list[str]: A list of filenames matching the specified criteria.
 
         Exclusion rules:
             - Ignores files starting with an underscore (_)
             - Skips files specified in `exclude_files`
+            - Skips directories specified in `ignore_dirs`
         """
         append_file_list = append_file_list or []
         exclude_files = set(exclude_files or [])
         exclude_extensions = set(exclude_extensions or [])
+        exclude_dirs = set(exclude_dirs or [])  # Set for faster lookup
+
+        for root, dirs, filenames in os.walk(directory):
+            # Remove ignored directories from the dirs list to prevent os.walk from entering them
+            dirs[:] = [d for d in dirs if d not in exclude_dirs]
 
-        for root, _, filenames in os.walk(directory):
             for filename in filenames:
                 if filename.startswith("_") or filename in exclude_files:
                     continue  # Skip excluded files

CODE/network_psutil.py

@@ -13,7 +13,7 @@ class NetworkInfo:
     """
 
     @log.function
-    def get(self):
+    async def get(self):
         """
         Gathers and saves various network-related information by calling multiple internal methods.
         """
@@ -24,7 +24,7 @@ def get(self):
             self.__fetch_network_interface_stats()
             self.__execute_external_network_command()
             self.__fetch_network_connections_with_process_info()
-            self.__measure_network_bandwidth_usage()
+            await self.__measure_network_bandwidth_usage()
             self.__fetch_hostname_and_ip()
         except Exception as e:
             log.error(f"Error getting network info: {e}, Type: {type(e).__name__}")
@@ -181,4 +181,9 @@ def __fetch_hostname_and_ip(self):
 
 
 if __name__ == "__main__":
-    NetworkInfo().get()
+    try:
+        asyncio.run(NetworkInfo().get())  # Use asyncio.run to run the async get method
+    except asyncio.CancelledError:
+        log.warning("Operation cancelled by user.")
+    except Exception as err:  # Catch all exceptions
+        log.error(f"An error occurred: {err}")