Fixed _debug.py

DefinetlyNotAI · DefinetlyNotAI · commit 877d03d79973 · 2024-12-17T21:49:17.000+04:00
Made it faster and cleaner, removed weird complexity issues, re-added the file check to the health check class, and fixed some minor bugs, fixed also _dev.py where now it gets all files and not code files for the health check, fixed many bugs related to this, and made the Get.list_of_files have a param for extensions to be optional, which is all on default

Signed-off-by: Shahm Najeeb &lt;Nirt_12023@outlook.com&gt;
diff --git a/CODE/Logicytics.py b/CODE/Logicytics.py
@@ -210,7 +210,7 @@ def generate_execution_list() -> list | list[str] | list[str | Any]:
     Returns:
         list: The execution list of scripts to be executed.
     """
-    execution_list = Get.list_of_files(".")
+    execution_list = Get.list_of_files(".", extensions=(".py", ".exe", ".ps1", ".bat"))
     execution_list.remove("sensitive_data_miner.py")
     execution_list.remove("dir_list.py")
     execution_list.remove("tree.ps1")
@@ -239,7 +239,9 @@ def generate_execution_list() -> list | list[str] | list[str | Any]:
 
     if ACTION == "modded":
         # Add all files in MODS to execution list
-        execution_list = Get.list_of_files("../MODS", execution_list)
+        execution_list = Get.list_of_files("../MODS",
+                                           extensions=(".py", ".exe", ".ps1", ".bat"),
+                                           append_file_list=execution_list)
 
     if ACTION == "depth":
         log.warning("This flag will use clunky and huge scripts, and so may take a long time, but reap great rewards.")
diff --git a/CODE/_debug.py b/CODE/_debug.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import configparser
-import os.path
+import os
 import platform
 import subprocess
 import sys
@@ -17,197 +17,237 @@
 
 
 class HealthCheck:
-    @log_debug.function
-    def get_online_config(self) -> bool | tuple[str, str, str]:
+    @staticmethod
+    def check_files(directory: str, required_files: list[str]) -> tuple[str, str]:
+        """
+        Checks if all required files are present in the directory and its subdirectories.
+
+        Args:
+            directory (str): Path to the directory to check.
+            required_files (list[str]): List of required file names with relative paths.
+
+        Returns:
+            tuple[str, str]: Status message and severity level.
+        """
+        try:
+            log_debug.debug(f"Checking directory: {directory}")
+            if not os.path.exists(directory):
+                log_debug.error(f"Directory {directory} does not exist.")
+                return f"Directory {directory} does not exist.", "ERROR"
+
+            # Gather all files with relative paths
+            actual_files = []
+            for root, _, files in os.walk(directory):
+                for file in files:
+                    relative_path = os.path.relpath(os.path.join(root, file), start=directory)
+                    actual_files.append(
+                        relative_path.replace("\\", "/").replace('"', ''))  # Normalize paths for comparison
+
+            log_debug.debug(f"Actual files found: {actual_files}")
+
+            # Track missing and extra files
+            missing_files = []
+            extra_files = []
+
+            # Normalize required files
+            normalized_required_files = [required_file.strip().replace("\\", "/").replace('"', '') for required_file in
+                                         required_files]
+
+            # Check for missing files
+            for required_file in normalized_required_files:
+                if required_file not in actual_files:
+                    missing_files.append(required_file)
+
+            log_debug.debug(f"Missing files: {missing_files}")
+
+            # Check for extra files
+            for actual_file in actual_files:
+                if actual_file not in normalized_required_files:
+                    extra_files.append(actual_file)
+
+            log_debug.debug(f"Extra files: {extra_files}")
+
+            if missing_files:
+                return f"Missing files: {', '.join(missing_files)}", "ERROR"
+            if extra_files:
+                return f"Extra files found: {', '.join(extra_files)}", "WARNING"
+            return "All required files are present.", "INFO"
+
+        except Exception as e:
+            log_debug.error(f"Unexpected error during file check: {e}")
+            return f"Unexpected error during file check: {e}", "ERROR"
+
+    @staticmethod
+    def get_online_config() -> dict | None:
         """
-        Retrieves configuration data from a remote repository and compares it with the local configuration.
+        Retrieves configuration data from a remote repository.
 
         Returns:
-            bool: False if a connection error occurs, otherwise a tuple containing version check and file check results.
-            tuple[tuple[str, str, str], tuple[str, str, str]]: A tuple containing version check and file check results.
+            dict: Parsed configuration data if successful.
+            None: If there was an error fetching the configuration.
         """
         try:
             url = "https://raw.githubusercontent.com/DefinetlyNotAI/Logicytics/main/CODE/config.ini"
             config = configparser.ConfigParser()
             config.read_string(requests.get(url, timeout=15).text)
-        except requests.exceptions.ConnectionError:
-            log_debug.warning("No connection found")
-            return False
-        version_check = self.__compare_versions(VERSION, config["System Settings"]["version"])
-
-        return version_check
+            return config
+        except requests.exceptions.RequestException as e:
+            log_debug.warning(f"Connection error: {e}")
+            return None
 
     @staticmethod
-    def __compare_versions(
-        local_version: str, remote_version: str
-    ) -> tuple[str, str, str]:
+    def compare_versions(local_version: str, remote_version: str) -> tuple[str, str, str]:
         """
-        Compares the local version with the remote version and returns a tuple containing a comparison result message,
-        a version information message, and a severity level.
+        Compares local and remote versions.
 
         Args:
-            local_version (str): The version number of the local system.
-            remote_version (str): The version number of the remote repository.
+            local_version (str): Local version.
+            remote_version (str): Remote version.
 
         Returns:
-            tuple[str, str, str]: A tuple containing a comparison result message, a version information message, and a severity level.
+            tuple[str, str, str]: Comparison result, version details, and severity level.
         """
         if local_version == remote_version:
             return "Version is up to date.", f"Your Version: {local_version}", "INFO"
-        elif local_version > remote_version:
+        if local_version > remote_version:
             return (
                 "Version is ahead of the repository.",
                 f"Your Version: {local_version}, Repository Version: {remote_version}",
                 "WARNING",
             )
-        else:
-            return (
-                "Version is behind the repository.",
-                f"Your Version: {local_version}, Repository Version: {remote_version}",
-                "ERROR",
-            )
+        return (
+            "Version is behind the repository.",
+            f"Your Version: {local_version}, Repository Version: {remote_version}",
+            "ERROR",
+        )
 
 
 class DebugCheck:
     @staticmethod
-    @log_debug.function
     def sys_internal_binaries(path: str) -> tuple[str, str]:
         """
-        Checks the contents of the given path and determines the status of the SysInternal Binaries.
+        Checks the SysInternal Binaries in the given directory.
 
         Args:
-            path (str): The path to the directory containing the SysInternal Binaries.
+            path (str): Directory path.
 
         Returns:
-            tuple[str, str]: A tuple containing a status message and a severity level.
-                The status message indicates the result of the check.
-                The severity level is either "INFO", "WARNING", or "ERROR".
-
-        Raises:
-            FileNotFoundError: If the given path does not exist.
-            Exception: If an unexpected error occurs during the check.
+            tuple[str, str]: Status message and severity level.
         """
         try:
+            if not os.path.exists(path):
+                raise FileNotFoundError("Directory does not exist")
+
             contents = os.listdir(path)
             log_debug.debug(str(contents))
+
+            has_zip = any(file.endswith(".zip") for file in contents)
+            has_exe = any(file.endswith(".exe") for file in contents)
+
             if any(file.endswith(".ignore") for file in contents):
                 return "A `.sys.ignore` file was found - Ignoring", "WARNING"
-            if any(file.endswith(".zip") for file in contents) and not any(
-                file.endswith(".exe") for file in contents
-            ):
-                return "Only zip files - Missing EXE's due to no `ignore` file", "ERROR"
-            elif any(file.endswith(".zip") for file in contents) and any(
-                file.endswith(".exe") for file in contents
-            ):
+            if has_zip and not has_exe:
+                return "Only zip files - Missing EXEs due to no `ignore` file", "ERROR"
+            if has_zip and has_exe:
                 return "Both zip and exe files - All good", "INFO"
-            else:
-                return (
-                    "SysInternal Binaries Not Found: Missing Files - Corruption detected",
-                    "ERROR",
-                )
-        except FileNotFoundError:
-            return (
-                "SysInternal Binaries Not Found: Missing Directory- Corruption detected",
-                "ERROR",
-            )
+
+            return "SysInternal Binaries Not Found: Missing Files - Corruption detected", "ERROR"
         except Exception as e:
-            return f"An Unexpected error occurred: {e}", "ERROR"
+            return f"Unexpected error: {e}", "ERROR"
 
     @staticmethod
-    @log_debug.function
     def execution_policy() -> bool:
         """
-        Checks the current PowerShell execution policy.
+        Checks if the execution policy is unrestricted.
 
         Returns:
-            bool: True if the execution policy is unrestricted, False otherwise.
+            bool: True if unrestricted, False otherwise.
         """
-        result = subprocess.run(
-            ["powershell", "-Command", "Get-ExecutionPolicy"],
-            capture_output=True,
-            text=True,
-        )
-        return result.stdout.strip().lower() == "unrestricted"
+        try:
+            result = subprocess.run(
+                ["powershell", "-Command", "Get-ExecutionPolicy"],
+                capture_output=True,
+                text=True,
+            )
+            return result.stdout.strip().lower() == "unrestricted"
+        except Exception as e:
+            log_debug.error(f"Failed to check execution policy: {e}")
+            return False
 
     @staticmethod
-    @log_debug.function
     def cpu_info() -> tuple[str, str, str]:
         """
-        Retrieves information about the CPU.
+        Retrieves CPU details.
 
         Returns:
-            tuple[str, str, str]: A tuple containing the CPU architecture, vendor ID, and model.
+            tuple[str, str, str]: Architecture, vendor ID, and model.
         """
         return (
-            "CPU Architecture: " + platform.machine(),
-            "CPU Vendor ID: " + platform.system(),
-            "CPU Model: " + f"{platform.release()} {platform.version()}",
+            f"CPU Architecture: {platform.machine()}",
+            f"CPU Vendor ID: {platform.system()}",
+            f"CPU Model: {platform.release()} {platform.version()}",
         )
 
 
-@log_debug.function
 def debug():
     """
-    Performs a series of system checks and logs the results.
+    Executes system checks and logs results.
     """
     # Clear Debug Log
     log_path = "../ACCESS/LOGS/DEBUG/DEBUG.LOG"
     if os.path.exists(log_path):
         os.remove(log_path)
 
-    # Check File integrity (Online)
-    online_config = HealthCheck().get_online_config()
-    if online_config:
-        version_tuple = online_config
-        log_debug.string(version_tuple[0], version_tuple[2])
-        log_debug.raw(f"[{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}] > DATA:     | {version_tuple[1] + ' ' * (153 - len(version_tuple[1])) + '|'}")
+    # Online Configuration Check
+    config = HealthCheck.get_online_config()
+    if config:
+        version_check = HealthCheck.compare_versions(VERSION, config["System Settings"]["version"])
+        log_debug.string(version_check[0], version_check[2])
+        log_debug.raw(f"[{datetime.now():%Y-%m-%d %H:%M:%S}] > DATA: {version_check[1]}")
 
-    # Check SysInternal Binaries
-    message, type = DebugCheck.sys_internal_binaries("SysInternal_Suite")
-    log_debug.string(message, type)
+        # File Integrity Check
+        required_files = config["System Settings"].get("files", "").split(",")
+        message, severity = HealthCheck.check_files(".", required_files)
+        log_debug.string(message, severity)
 
-    # Check Admin
-    log_debug.info("Admin privileges found" if Check.admin() else "Admin privileges not found")
+    # SysInternal Binaries Check
+    message, severity = DebugCheck.sys_internal_binaries("SysInternal_Suite")
+    log_debug.string(message, severity)
 
-    # Check UAC
+    # System Checks
+    log_debug.info("Admin privileges found" if Check.admin() else "Admin privileges not found")
     log_debug.info("UAC enabled" if Check.uac() else "UAC disabled")
-
-    # Log Execution Paths
     log_debug.info(f"Execution path: {psutil.__file__}")
     log_debug.info(f"Global execution path: {sys.executable}")
     log_debug.info(f"Local execution path: {sys.prefix}")
+    log_debug.info(
+        "Running in a virtual environment" if sys.prefix != sys.base_prefix else "Not running in a virtual environment")
 
-    # Check if running in a virtual environment
-    log_debug.info("Running in a virtual environment" if sys.prefix != sys.base_prefix else "Not running in a virtual environment")
-
-    # Check Execution Policy
-    log_debug.info("Execution policy is unrestricted" if DebugCheck.execution_policy() else "Execution policy is not unrestricted")
+    # Execution Policy Check
+    log_debug.info(
+        "Execution policy is unrestricted" if DebugCheck.execution_policy() else "Execution policy is not unrestricted")
 
-    # Get Python Version
+    # Python Version Check
+    python_version = sys.version.split()[0]
     try:
-        major, minor = map(int, sys.version.split()[0].split(".")[:2])
-        if major == 3 and minor == 11:
-            log_debug.info(f"Python Version Used: {sys.version.split()[0]} - Perfect")
+        major, minor = map(int, python_version.split(".")[:2])
+        if (major, minor) == (3, 11):
+            log_debug.info(f"Python Version: {python_version} - Perfect")
         elif major == 3:
-            log_debug.warning(f"Python Version Used: {sys.version.split()[0]} - Recommended Version is: 3.11.X")
+            log_debug.warning(f"Python Version: {python_version} - Recommended: 3.11.x")
         else:
-            log_debug.error(f"Python Version Used: {sys.version.split()[0]} - Incompatible Version")
+            log_debug.error(f"Python Version: {python_version} - Incompatible")
     except Exception as e:
-        log_debug.error(f"Failed to get Python Version: {e}")
+        log_debug.error(f"Failed to parse Python Version: {e}")
 
-    # Get Repo Path
-    log_debug.info(os.path.abspath(__file__).removesuffix("\\CODE\\_debug.py"))
+    # CPU Info
+    for info in DebugCheck.cpu_info():
+        log_debug.info(info)
 
-    # Get CPU Info
-    architecture, vID, cpuModel = DebugCheck.cpu_info()
-    log_debug.info(architecture)
-    log_debug.info(vID)
-    log_debug.info(cpuModel)
-
-    # Get config data
+    # Final Debug Status
     log_debug.info(f"Debug: {DEBUG}")
 
 
-debug()
-input("Press Enter to exit...")
-exit(0)
+if __name__ == "__main__":
+    debug()
+    input("Press Enter to exit...")
diff --git a/CODE/_dev.py b/CODE/_dev.py
@@ -86,8 +86,8 @@ def dev_checks() -> None:
                 log_dev.warning("Fix the issues and try again with the checklist.")
                 return None
 
-        # Get the list of code files in the current directory
-        files = Get.list_of_code_files(".")
+        # Get the list of files in the current directory
+        files = Get.list_of_files(".", True)
         added_files, removed_files, normal_files = [], [], []
         clean_files_list = [file.replace('"', '') for file in CURRENT_FILES]
 
diff --git a/CODE/config.ini b/CODE/config.ini
@@ -9,8 +9,8 @@ delete_old_logs = false
 
 [System Settings]
 # Do not play with these settings unless you know what you are doing
-version = 3.1.1
-files = "bluetooth_details.py, bluetooth_logger.py, browser_miner.ps1, cmd_commands.py, dir_list.py, dump_memory.py, event_log.py, Logicytics.py, log_miner.py, media_backup.py, netadapter.ps1, 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, _debug.py, _dev.py, _extra.py, logicytics\Checks.py, logicytics\Execute.py, logicytics\FileManagement.py, logicytics\Flag.py, logicytics\Get.py, logicytics\Logger.py, logicytics\__init__.py, VulnScan\tools\_study_network.py, VulnScan\tools\_test_gpu_acceleration.py, VulnScan\tools\_vectorizer.py, VulnScan\v2-deprecated\_generate_data.py, VulnScan\v2-deprecated\_train.py, VulnScan\v3\_generate_data.py, VulnScan\v3\_train.py"
+version = 3.1.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, 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, _debug.py, _dev.py, _extra.py, logicytics\Checks.py, logicytics\Execute.py, logicytics\FileManagement.py, logicytics\Flag.py, logicytics\Get.py, logicytics\Logger.py, logicytics\__init__.py, SysInternal_Suite\.sys.ignore, SysInternal_Suite\SysInternal_Suite.zip, VulnScan\Model SenseMini .3n3.pth, VulnScan\README.md, VulnScan\Vectorizer .3n3.pkl, VulnScan\tools\_study_network.py, VulnScan\tools\_test_gpu_acceleration.py, VulnScan\tools\_vectorizer.py, VulnScan\v2-deprecated\_generate_data.py, VulnScan\v2-deprecated\_train.py, VulnScan\v3\_generate_data.py, VulnScan\v3\_train.py"
 
 ###################################################
 # The following settings are for specific modules #
diff --git a/CODE/logicytics/Get.py b/CODE/logicytics/Get.py
