Incorporated most CodeRabbit [suggestions](#225 (review))

Removed 2 commands from bluetooth_logger.py to fix the bug where is just fails due to the event log not actually existing

Fully remade packet_sniffer.py to remove the already buggy code and deprecation warnings

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

Author: DefinetlyNotAI

CODE/Logicytics.py

@@ -12,7 +12,7 @@
 import psutil
 from prettytable import PrettyTable
 
-from logicytics import Log, Execute, Check, Get, FileManagement, Flag, DEBUG, DELETE_LOGS, config
+from logicytics import Log, execute, check, get, file_management, flag, DEBUG, DELETE_LOGS, config
 
 # Initialization
 log = Log({"log_level": DEBUG, "delete_log": DELETE_LOGS})
@@ -66,7 +66,7 @@ def __generate_execution_list(self) -> list[str]:
             - Logs the final execution list for debugging purposes
             - Warns users about potential long execution times for certain actions
         """
-        execution_list = Get.list_of_files(".", only_extensions=(".py", ".exe", ".ps1", ".bat"),
+        execution_list = get.list_of_files(".", only_extensions=(".py", ".exe", ".ps1", ".bat"),
                                            exclude_files=["Logicytics.py"],
                                            exclude_dirs=["logicytics", "SysInternal_Suite"])
         files_to_remove = {
@@ -101,7 +101,7 @@ 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"),
+            execution_list = get.list_of_files("../MODS", only_extensions=(".py", ".exe", ".ps1", ".bat"),
                                                append_file_list=execution_list, exclude_files=["Logicytics.py"],
                                                exclude_dirs=["logicytics", "SysInternal_Suite"])
 
@@ -144,7 +144,7 @@ def __script_handler(script: str) -> tuple[str, Exception | None]:
         """
         log.debug(f"Executing {script}")
         try:
-            log.execution(Execute.script(script))
+            log.execution(execute.script(script))
             log.info(f"{script} executed successfully")
             return script, None
         except Exception as err:
@@ -207,7 +207,7 @@ def __performance(self):
             gc.collect()
             start_time = datetime.now()
             start_memory = process.memory_full_info().uss / 1024 / 1024  # MB
-            log.execution(Execute.script(self.execution_list[file]))
+            log.execution(execute.script(self.execution_list[file]))
             end_time = datetime.now()
             end_memory = process.memory_full_info().uss / 1024 / 1024  # MB
             elapsed_time = end_time - start_time
@@ -352,7 +352,7 @@ def get_flags():
     """
     global ACTION, SUB_ACTION
     # Get flags_list
-    ACTION, SUB_ACTION = Flag.data()
+    ACTION, SUB_ACTION = flag.data()
     log.debug(f"Action: {ACTION}")
     log.debug(f"Sub-Action: {SUB_ACTION}")
 
@@ -382,7 +382,7 @@ def handle_special_actions():
         log.info("Opening debug menu...")
         SpecialAction.execute_new_window("_debug.py")
 
-    messages = Check.sys_internal_zip()
+    messages = check.sys_internal_zip()
     if messages:
         # If there are messages, log them with debug
         log.debug(messages)
@@ -407,7 +407,7 @@ def handle_special_actions():
             "Sorry, this feature is yet to be implemented. You can manually Restore your backups, We will open "
             "the location for you"
         )
-        FileManagement.open_file("../ACCESS/BACKUP/")
+        file_management.open_file("../ACCESS/BACKUP/")
         input("Press Enter to exit...")
         exit(1)
 
@@ -438,7 +438,7 @@ def check_privileges():
         - Depends on global `DEBUG` configuration variable
         - Logs warnings or critical messages based on privilege and UAC status
     """
-    if not Check.admin():
+    if not check.admin():
         if DEBUG == "DEBUG":
             log.warning("Running in debug mode, continuing without admin privileges - This may cause issues")
         else:
@@ -447,7 +447,7 @@ def check_privileges():
             input("Press Enter to exit...")
             exit(1)
 
-    if Check.uac():
+    if check.uac():
         log.warning("UAC is enabled, this may cause issues - Please disable UAC if possible")
 
 
@@ -462,7 +462,7 @@ def files(cls):
     @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(
+        zip_values = file_management.Zip.and_hash(
             directory,
             name,
             ACTION if ACTION is not None else f"ERROR_NO_ACTION_SPECIFIED_{datetime.now().isoformat()}"
@@ -531,8 +531,8 @@ def Logicytics():
         Logicytics()
     except KeyboardInterrupt:
         log.warning("Force shutdown detected! Some temporary files might be left behind.")
-        log.warning("Pro tip: Next time, let the program finish naturally.")
-        # Attempt cleanup -> Zip generated files
+        log.warning("Next time, let the program finish naturally for complete cleanup.")
+        # Emergency cleanup - zip generated files
         ZIP.files()
         exit(0)
 else:

CODE/_debug.py

@@ -9,7 +9,7 @@
 import psutil
 import requests
 
-from logicytics import Log, DEBUG, VERSION, Check, config
+from logicytics import Log, DEBUG, VERSION, check, config
 
 log_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "ACCESS\\LOGS\\DEBUG\\DEBUG.log")
 log = Log({"log_level": DEBUG, "filename": log_path, "truncate_message": False, "delete_log": True})
@@ -206,15 +206,15 @@ def debug():
     SysInternalManager.check_binaries("SysInternal_Suite")
 
     # System Checks
-    log.info("Admin privileges found" if Check.admin() else "Admin privileges not found")
-    log.info("UAC enabled" if Check.uac() else "UAC disabled")
+    log.info("Admin privileges found" if check.admin() else "Admin privileges not found")
+    log.info("UAC enabled" if check.uac() else "UAC disabled")
     log.info(f"Execution path: {psutil.__file__}")
     log.info(f"Global execution path: {sys.executable}")
     log.info(f"Local execution path: {sys.prefix}")
     log.info(
         "Running in a virtual environment" if sys.prefix != sys.base_prefix else "Not running in a virtual environment")
     log.info(
-        "Execution policy is unrestricted" if Check.execution_policy() else "Execution policy is restricted")
+        "Execution policy is unrestricted" if check.execution_policy() else "Execution policy is restricted")
 
     # Python Version Check
     SystemInfoManager.python_version()

CODE/_dev.py

@@ -6,7 +6,7 @@
 
 import configobj
 
-from logicytics import log, Get, FileManagement, CURRENT_FILES, VERSION
+from logicytics import log, get, file_management, CURRENT_FILES, VERSION
 
 
 def color_print(text, color="reset", is_input=False) -> None | str:
@@ -21,9 +21,8 @@ def color_print(text, color="reset", is_input=False) -> None | str:
     color_code = colors.get(color.lower(), colors["reset"])
     if is_input:
         return input(f"{color_code}{text}{colors['reset']}")
-    else:
-        print(f"{color_code}{text}{colors['reset']}")
-        return None
+    print(f"{color_code}{text}{colors['reset']}")
+    return None
 
 
 def _update_ini_file(filename: str, new_data: list | str, key: str) -> None:
@@ -118,7 +117,7 @@ def _handle_file_operations() -> None:
     Handles file operations and logging for added, removed, and normal files.
     """
     EXCLUDE_FILES = ["logicytics\\User_History.json.gz", "logicytics\\User_History.json"]
-    files = Get.list_of_files(".", exclude_files=EXCLUDE_FILES, exclude_dirs=["SysInternal_Suite"],
+    files = get.list_of_files(".", exclude_files=EXCLUDE_FILES, exclude_dirs=["SysInternal_Suite"],
                               exclude_extensions=[".pyc"])
     added_files, removed_files, normal_files = [], [], []
     clean_files_list = [file.replace('"', '') for file in CURRENT_FILES]
@@ -190,7 +189,7 @@ def dev_checks() -> None:
         - Updates configuration file with current files and version
         - Logs warnings or errors during the process
     """
-    FileManagement.mkdir()
+    file_management.mkdir()
     if not _perform_checks():
         return
     _handle_file_operations()

CODE/bluetooth_details.py

@@ -106,6 +106,7 @@ def _write_device_info_to_file(devices: list[dict[str, str]], filename: str):
         with open(filename, "w", encoding="UTF-8") as file:
             for device_info in devices:
                 _write_single_device_info(file, device_info)
+        log.info(f"Successfully wrote device details to '{filename}'")
     except Exception as e:
         log.error(f"Failed to write device information to file: {e}")
 

CODE/bluetooth_logger.py

@@ -169,41 +169,6 @@ def log_bluetooth():
     save_to_file(filename, section_title, paired_devices or ["No paired Bluetooth devices found."])
     log.debug(f"{section_title}: {paired_devices}")
 
-    # Collect and log event logs
-    def collect_logs(title: str, command: str):
-        """
-        Collects and logs event logs by executing a PowerShell command and saving the results.
-        
-        Args:
-            title (str): The title or description of the log section being collected.
-            command (str): The PowerShell command to execute for retrieving event logs.
-        
-        Behavior:
-            - Runs the specified PowerShell command using `run_powershell_command()`
-            - Saves the log results to a file using `save_to_file()`
-            - Logs an informational message about the log collection
-            - If no logs are found, saves a default "No logs found." message
-            - Uses the global `filename` variable for log file destination
-        
-        Raises:
-            Potential exceptions from `run_powershell_command()` and `save_to_file()` which are handled internally
-        """
-        logs = run_powershell_command(command)
-        save_to_file(filename, title, logs or ["No logs found."])
-        log.info(f"Getting {title}...")
-
-    collect_logs(
-        "Bluetooth Connection/Disconnection Logs",
-        'Get-WinEvent -LogName "Microsoft-Windows-Bluetooth-BthLEServices/Operational" '
-        '| Select-Object TimeCreated, Id, Message | Format-Table -AutoSize'
-    )
-
-    collect_logs(
-        "Bluetooth File Transfer Logs",
-        'Get-WinEvent -LogName "Microsoft-Windows-Bluetooth-BthLEServices/Operational" '
-        '| Select-String -Pattern "file.*transferred" | Format-Table -AutoSize'
-    )
-
     log.info("Finished Bluetooth data logging.")
 
 

CODE/cmd_commands.py

@@ -1,4 +1,4 @@
-from logicytics import log, Execute
+from logicytics import log, execute
 
 
 @log.function
@@ -17,7 +17,7 @@ def command(file: str, commands: str, message: str, encoding: str = "UTF-8") ->
     """
     log.info(f"Executing {message}")
     try:
-        output = Execute.command(commands)
+        output = execute.command(commands)
         with open(file, "w", encoding=encoding) as f:
             f.write(output)
         log.info(f"{message} Successful - {file}")

CODE/config.ini

@@ -28,6 +28,8 @@ save_preferences = true
 # Dev Mode allows a safe way to modify these settings!!
 version = 3.4.2
 files = "bluetooth_details.py, bluetooth_logger.py, browser_miner.ps1, cmd_commands.py, config.ini, dir_list.py, dump_memory.py, event_log.py, Logicytics.py, log_miner.py, media_backup.py, netadapter.ps1, network_psutil.py, packet_sniffer.py, property_scraper.ps1, registry.py, sensitive_data_miner.py, ssh_miner.py, sys_internal.py, tasklist.py, tree.ps1, vulnscan.py, wifi_stealer.py, window_feature_miner.ps1, wmic.py, logicytics\Checks.py, logicytics\Config.py, logicytics\Execute.py, logicytics\FileManagement.py, logicytics\Flag.py, logicytics\Get.py, logicytics\Logger.py, logicytics\User_History.json.gz, VulnScan\Model SenseMini .3n3.pth, VulnScan\README.md, VulnScan\Vectorizer .3n3.pkl"
+# If you forked the project, change the USERNAME to your own to use your own fork as update material,
+# I dont advise doing this however
 config_url = https://raw.githubusercontent.com/DefinetlyNotAI/Logicytics/main/CODE/config.ini
 
 ########################################################
@@ -100,6 +102,7 @@ max_retry_time = 30
 ###################################################
 [VulnScan Settings]
 # Following extensions to be skipped by the model
+# Format: comma-separated list with dots (e.g., .exe, .dll)
 unreadable_extensions = .exe, .dll, .so, .zip, .tar, .gz, .7z, .rar, .jpg, .jpeg, .png, .gif, .bmp, .tiff, .webp, .mp3, .wav, .flac, .aac, .ogg, .mp4, .mkv, .avi, .mov, .wmv, .flv, .pdf, .doc, .docx, .xls, .xlsx, .ppt, .pptx, .odt, .ods, .odp, .bin, .dat, .iso, .class, .pyc, .o, .obj, .sqlite, .db, .ttf, .otf, .woff, .woff2, .lnk, .url
 # In MB, max file size that the model is allowed to scan, if commented out disables the limit, you can also just say None
 max_file_size_mb = None

CODE/dir_list.py

@@ -1,7 +1,7 @@
 import os
 from concurrent.futures import ThreadPoolExecutor
 
-from logicytics import log, Execute
+from logicytics import log, execute
 
 
 def run_command_threaded(directory: str, file: str, message: str, encoding: str = "UTF-8") -> None:
@@ -26,7 +26,7 @@ def run_command_threaded(directory: str, file: str, message: str, encoding: str
     try:
         safe_directory = directory.replace('"', '`"')  # Escape quotes
         command = f'powershell -NoProfile -Command "Get-ChildItem \\""{safe_directory}\\"" -Recurse"'
-        output = Execute.command(command)
+        output = execute.command(command)
         open(file, "a", encoding=encoding).write(output)
         log.info(f"{message} Successful for {directory} - {file}")
     except Exception as e:

CODE/dump_memory.py

@@ -4,21 +4,18 @@
 from datetime import datetime
 
 import psutil
-from psutil._common import sswap
 
 from logicytics import log, config
 
 # Constants from config with validation
 LIMIT_FILE_SIZE = config.getint("DumpMemory Settings", "file_size_limit")  # MiB
 SAFETY_MARGIN = config.getfloat("DumpMemory Settings", "file_size_safety")  # MiB
+DUMP_DIR = config.get("DumpMemory Settings", "dump_directory", fallback="memory_dumps")
 
 if SAFETY_MARGIN < 1:
     log.critical("Invalid Safety Margin Inputted - Cannot proceed with dump memory")
     exit(1)
 
-DUMP_DIR = config.get("DumpMemory Settings", "dump_directory", fallback="memory_dumps")
-os.makedirs(DUMP_DIR, exist_ok=True)
-
 
 def capture_ram_snapshot():
     """
@@ -41,7 +38,7 @@ def capture_ram_snapshot():
         Exception: For any unexpected errors during memory snapshot capture
     """
 
-    def memory_helper(mem_var: psutil.svmem | sswap, flavor_text: str, use_free_rather_than_available: bool = False):
+    def memory_helper(mem_var, flavor_text: str, use_free_rather_than_available: bool = False):
         file.write(f"Total {flavor_text}: {mem_var.total / (1024 ** 3):.2f} GB\n")
         file.write(f"Used {flavor_text}: {mem_var.used / (1024 ** 3):.2f} GB\n")
         if use_free_rather_than_available:
@@ -54,7 +51,7 @@ def memory_helper(mem_var: psutil.svmem | sswap, flavor_text: str, use_free_rath
     try:
         memory = psutil.virtual_memory()
         swap = psutil.swap_memory()
-        with open(os.path.join(DUMP_DIR, "Ram_Snapshot.txt"), "w") as file:
+        with open(os.path.join(DUMP_DIR, "Ram_Snapshot.txt"), "w", encoding="utf-8") as file:
             memory_helper(memory, "RAM")
             memory_helper(swap, "Swap Memory", use_free_rather_than_available=True)
     except Exception as e:

CODE/logicytics/Config.py

@@ -26,8 +26,7 @@ def _config_path() -> str:
 
         if os.path.exists(configs_path):
             return configs_path
-        else:
-            exit("The config.ini file is not found in the expected location.")
+        exit("The config.ini file is not found in the expected location.")
 
     config_local = configparser.ConfigParser()
     path = _config_path()