souleyez 2.43.34__py3-none-any.whl → 3.0.7__py3-none-any.whl

souleyez/engine/result_handler.py

@@ -2,10 +2,12 @@
 """
 souleyez.engine.result_handler - Auto-parse job results
 """
-import os
+
 import logging
-from typing import Optional, Dict, Any
-from .job_status import STATUS_DONE, STATUS_NO_RESULTS, STATUS_WARNING, STATUS_ERROR
+import os
+from typing import Any, Dict, Optional
+
+from .job_status import STATUS_DONE, STATUS_ERROR, STATUS_NO_RESULTS, STATUS_WARNING
 
 logger = logging.getLogger(__name__)
 
@@ -49,7 +51,8 @@ TOOL_ERROR_PATTERNS = {
     "nuclei": [
         "could not connect",
         "context deadline exceeded",
-        "no address found",
+        # Note: "no address found" removed - nuclei reports this as [INF] when
+        # templates try alternate ports, not a real error. Exit code 0 = success.
     ],
     "ffuf": [
         "error making request",
@@ -129,36 +132,11 @@ def handle_job_result(job: Dict[str, Any]) -> Optional[Dict[str, Any]]:
     """
     tool = job.get("tool", "").lower()
     log_path = job.get("log")
-    status = job.get("status")
-
-    # Some tools return non-zero exit codes even on success
-    # Parse 'done' jobs and 'error' jobs for certain tools
-    # gobuster: exits 1 for wildcard detection (but we can still parse and retry)
-    # enum4linux: exits non-zero when some queries fail, even with partial results
-    # msf_exploit: exits 0 even on failure, but we want to parse either way
-    # hashcat: exits 1 when exhausted (no passwords cracked) - not an error
-    # web_login_test: exits 1 when credentials fail - not an error, just invalid creds
-    tools_with_nonzero_success = [
-        "gobuster",
-        "msf_auxiliary",
-        "msfconsole",
-        "enum4linux",
-        "msf_exploit",
-        "wpscan",
-        "hashcat",
-        "web_login_test",
-    ]
-
-    if status == "done":
-        # Always parse successful jobs
-        pass
-    elif status == "error" and tool in tools_with_nonzero_success:
-        # Parse error jobs for tools that can succeed with non-zero exit codes
-        pass
-    else:
-        # Skip other error/failed jobs
-        return None
 
+    # Always try to parse if log file exists
+    # Status checks were causing race conditions where jobs showed "done"
+    # but get_job() returned stale status, causing parse to be skipped
+    # The caller (background.py) only calls us for completed jobs anyway
     if not log_path or not os.path.exists(log_path):
         logger.error(
             f"Job {job.get('id')} parse failed: log file missing or does not exist (path={log_path})"
@@ -193,9 +171,9 @@ def handle_job_result(job: Dict[str, Any]) -> Optional[Dict[str, Any]]:
 
     try:
         from souleyez.handlers.registry import get_handler
-        from souleyez.storage.hosts import HostManager
-        from souleyez.storage.findings import FindingsManager
         from souleyez.storage.credentials import CredentialsManager
+        from souleyez.storage.findings import FindingsManager
+        from souleyez.storage.hosts import HostManager
 
         handler = get_handler(tool)
         if handler:
@@ -306,7 +284,7 @@ def reparse_job(job_id: int) -> Dict[str, Any]:
     Returns:
         Dict with 'success', 'message', and optionally 'parse_result'
     """
-    from .background import get_job, _read_jobs, _write_jobs
+    from .background import _read_jobs, _write_jobs, get_job
 
     # Get the job
     job = get_job(job_id)
@@ -345,9 +323,9 @@ def reparse_job(job_id: int) -> Dict[str, Any]:
 
     try:
         from souleyez.handlers.registry import get_handler
-        from souleyez.storage.hosts import HostManager
-        from souleyez.storage.findings import FindingsManager
         from souleyez.storage.credentials import CredentialsManager
+        from souleyez.storage.findings import FindingsManager
+        from souleyez.storage.hosts import HostManager
 
         handler = get_handler(tool)
         if handler:
@@ -527,10 +505,10 @@ def parse_nmap_job(
 ) -> Dict[str, Any]:
     """Parse nmap job results."""
     try:
+        from souleyez.core.cve_matcher import CVEMatcher
         from souleyez.parsers.nmap_parser import parse_nmap_log
-        from souleyez.storage.hosts import HostManager
         from souleyez.storage.findings import FindingsManager
-        from souleyez.core.cve_matcher import CVEMatcher
+        from souleyez.storage.hosts import HostManager
 
         # Parse the log file
         parsed = parse_nmap_log(log_path)
@@ -804,11 +782,11 @@ def parse_theharvester_job(
     """Parse theHarvester job results."""
     try:
         from souleyez.parsers.theharvester_parser import (
-            parse_theharvester_output,
             get_osint_stats,
+            parse_theharvester_output,
         )
-        from souleyez.storage.osint import OsintManager
         from souleyez.storage.hosts import HostManager
+        from souleyez.storage.osint import OsintManager
 
         # Read the log file
         with open(log_path, "r", encoding="utf-8", errors="replace") as f:
@@ -1301,14 +1279,15 @@ def parse_gobuster_job(
 ) -> Dict[str, Any]:
     """Parse gobuster job results."""
     try:
+        from urllib.parse import urlparse
+
         from souleyez.parsers.gobuster_parser import (
-            parse_gobuster_output,
-            get_paths_stats,
             generate_next_steps,
+            get_paths_stats,
+            parse_gobuster_output,
         )
-        from souleyez.storage.web_paths import WebPathsManager
         from souleyez.storage.hosts import HostManager
-        from urllib.parse import urlparse
+        from souleyez.storage.web_paths import WebPathsManager
 
         # Read the log file
         with open(log_path, "r", encoding="utf-8", errors="replace") as f:
@@ -1532,11 +1511,12 @@ def parse_sqlmap_job(
 ) -> Dict[str, Any]:
     """Parse sqlmap job results."""
     try:
-        from souleyez.parsers.sqlmap_parser import parse_sqlmap_output, get_sqli_stats
+        from urllib.parse import urlparse
+
+        from souleyez.parsers.sqlmap_parser import get_sqli_stats, parse_sqlmap_output
         from souleyez.storage.findings import FindingsManager
         from souleyez.storage.hosts import HostManager
         from souleyez.storage.sqlmap_data import SQLMapDataManager
-        from urllib.parse import urlparse
 
         # Read the log file
         with open(log_path, "r", encoding="utf-8", errors="replace") as f:
@@ -1973,9 +1953,9 @@ def _extract_credentials_from_dump(
         tuple: (count of credentials added, list of plaintext credential dicts for chaining)
     """
     from souleyez.intelligence.sensitive_tables import is_sensitive_table
+    from souleyez.log_config import get_logger
     from souleyez.storage.credentials import CredentialsManager
     from souleyez.storage.hosts import HostManager
-    from souleyez.log_config import get_logger
 
     logger = get_logger(__name__)
     cred_manager = CredentialsManager()
@@ -2189,10 +2169,11 @@ def parse_msf_auxiliary_job(
     """Parse MSF auxiliary module job results."""
     try:
         import re
+
         from souleyez.parsers.msf_parser import parse_msf_log
-        from souleyez.storage.hosts import HostManager
-        from souleyez.storage.findings import FindingsManager
         from souleyez.storage.credentials import CredentialsManager
+        from souleyez.storage.findings import FindingsManager
+        from souleyez.storage.hosts import HostManager
 
         # Read raw log for connection failure detection
         with open(log_path, "r", encoding="utf-8", errors="replace") as f:
@@ -2348,8 +2329,9 @@ def parse_msf_exploit_job(
     """Parse MSF exploit module job results."""
     try:
         import re
-        from souleyez.storage.hosts import HostManager
+
         from souleyez.storage.findings import FindingsManager
+        from souleyez.storage.hosts import HostManager
 
         # Read the log file
         with open(log_path, "r", encoding="utf-8", errors="replace") as f:
@@ -2501,10 +2483,10 @@ def parse_smbmap_job(
 ) -> Dict[str, Any]:
     """Parse smbmap job results."""
     try:
-        from souleyez.parsers.smbmap_parser import parse_smbmap_output, extract_findings
-        from souleyez.storage.smb_shares import SMBSharesManager
+        from souleyez.parsers.smbmap_parser import extract_findings, parse_smbmap_output
         from souleyez.storage.findings import FindingsManager
         from souleyez.storage.hosts import HostManager
+        from souleyez.storage.smb_shares import SMBSharesManager
 
         # Read the log file
         with open(log_path, "r", encoding="utf-8", errors="replace") as f:
@@ -2604,9 +2586,9 @@ def parse_whois_job(
     """Parse WHOIS job results."""
     try:
         from souleyez.parsers.whois_parser import (
-            parse_whois_output,
-            map_to_osint_data,
             extract_emails,
+            map_to_osint_data,
+            parse_whois_output,
         )
         from souleyez.storage.osint import OsintManager
 
@@ -2666,8 +2648,8 @@ def parse_dnsrecon_job(
     """Parse dnsrecon job results."""
     try:
         from souleyez.parsers.dnsrecon_parser import parse_dnsrecon_output
-        from souleyez.storage.osint import OsintManager
         from souleyez.storage.hosts import HostManager
+        from souleyez.storage.osint import OsintManager
 
         # Read the log file
         with open(log_path, "r", encoding="utf-8", errors="replace") as f:
@@ -2818,8 +2800,8 @@ def parse_hydra_job(
     try:
         from souleyez.parsers.hydra_parser import parse_hydra_output
         from souleyez.storage.credentials import CredentialsManager
-        from souleyez.storage.hosts import HostManager
         from souleyez.storage.findings import FindingsManager
+        from souleyez.storage.hosts import HostManager
 
         # Read the log file
         with open(log_path, "r", encoding="utf-8", errors="replace") as f:
@@ -3165,9 +3147,9 @@ def parse_enum4linux_job(
     """Parse enum4linux job results."""
     try:
         from souleyez.parsers.enum4linux_parser import (
-            parse_enum4linux_output,
-            get_smb_stats,
             categorize_share,
+            get_smb_stats,
+            parse_enum4linux_output,
         )
         from souleyez.storage.findings import FindingsManager
         from souleyez.storage.hosts import HostManager
@@ -3310,8 +3292,8 @@ def parse_crackmapexec_job(
     """Parse CrackMapExec job results."""
     try:
         from souleyez.parsers.crackmapexec_parser import parse_crackmapexec
-        from souleyez.storage.hosts import HostManager
         from souleyez.storage.credentials import CredentialsManager
+        from souleyez.storage.hosts import HostManager
 
         target = job.get("target", "")
         parsed = parse_crackmapexec(log_path, target)
@@ -3379,8 +3361,8 @@ def parse_ffuf_job(
     """Parse ffuf job results."""
     try:
         from souleyez.parsers.ffuf_parser import parse_ffuf
-        from souleyez.storage.hosts import HostManager
         from souleyez.storage.findings import FindingsManager
+        from souleyez.storage.hosts import HostManager
 
         target = job.get("target", "")
         parsed = parse_ffuf(log_path, target)
@@ -3709,8 +3691,8 @@ def parse_nikto_job(
     """Parse nikto web server scanner results."""
     try:
         from souleyez.parsers.nikto_parser import (
-            parse_nikto_output,
             generate_next_steps,
+            parse_nikto_output,
         )
         from souleyez.storage.findings import FindingsManager
         from souleyez.storage.hosts import HostManager
@@ -3834,14 +3816,15 @@ def parse_http_fingerprint_job(
     based on detected WAF, CDN, or managed hosting platform.
     """
     try:
+        from urllib.parse import urlparse
+
         from souleyez.parsers.http_fingerprint_parser import (
-            parse_http_fingerprint_output,
             build_fingerprint_context,
-            get_tool_recommendations,
             generate_next_steps,
+            get_tool_recommendations,
+            parse_http_fingerprint_output,
         )
         from souleyez.storage.hosts import HostManager
-        from urllib.parse import urlparse
 
         target = job.get("target", "")
 
@@ -4084,8 +4067,8 @@ def parse_hashcat_job(
     """Parse hashcat job results and extract cracked passwords."""
     try:
         from souleyez.parsers.hashcat_parser import (
-            parse_hashcat_output,
             map_to_credentials,
+            parse_hashcat_output,
         )
         from souleyez.storage.credentials import CredentialsManager
         from souleyez.storage.findings import FindingsManager

souleyez/engine/worker_manager.py

@@ -2,9 +2,11 @@
 """
 Worker health check and management utilities
 """
-import psutil
+
 import time
-from typing import Optional, Tuple, Dict, Any
+from typing import Any, Dict, Optional, Tuple
+
+import psutil
 
 
 def is_worker_running() -> Tuple[bool, Optional[int]]:
@@ -49,7 +51,7 @@ def is_worker_healthy() -> Tuple[bool, Optional[int], Optional[str]]:
         - pid: Worker PID if found, None otherwise
         - issue: Description of issue if not healthy, None otherwise
     """
-    from souleyez.engine.background import get_heartbeat_age, HEARTBEAT_STALE_THRESHOLD
+    from souleyez.engine.background import HEARTBEAT_STALE_THRESHOLD, get_heartbeat_age
 
     is_running, pid = is_worker_running()
 
@@ -169,7 +171,7 @@ def get_worker_health() -> Dict[str, Any]:
         - cpu_percent: CPU usage percentage
         - memory_mb: Memory usage in MB
     """
-    from souleyez.engine.background import get_heartbeat_age, HEARTBEAT_STALE_THRESHOLD
+    from souleyez.engine.background import HEARTBEAT_STALE_THRESHOLD, get_heartbeat_age
 
     is_running, pid = is_worker_running()
     heartbeat_age = get_heartbeat_age()

souleyez/export/evidence_bundle.py

@@ -3,6 +3,7 @@
 Evidence bundle export to ZIP.
 Creates organized ZIP archive of all engagement evidence.
 """
+
 import os
 import zipfile
 from datetime import datetime

souleyez/handlers/base.py

@@ -5,6 +5,7 @@ Base handler class for tool result parsing and display.
 All tool handlers inherit from BaseToolHandler and implement
 the required methods for their specific tool.
 """
+
 import logging
 from abc import ABC, abstractmethod
 from typing import Any, Dict, Optional

souleyez/handlers/bash_handler.py

@@ -5,6 +5,7 @@ Bash handler.
 Handles bash script execution results, particularly for auto-generated
 scripts like web login credential tests.
 """
+
 import logging
 import os
 import re

souleyez/handlers/bloodhound_handler.py

@@ -3,6 +3,7 @@
 Handler for BloodHound - Active Directory attack path mapping.
 Parses bloodhound-python collection results.
 """
+
 import logging
 import os
 import re

souleyez/handlers/certipy_handler.py

@@ -3,6 +3,7 @@
 Handler for Certipy - Active Directory Certificate Services (ADCS) enumeration.
 Parses vulnerable certificate templates (ESC1-ESC8).
 """
+
 import logging
 import os
 import re

souleyez/handlers/crackmapexec_handler.py

@@ -105,24 +105,8 @@ class CrackMapExecHandler(BaseToolHandler):
             vulns_found = len(parsed.get("findings", {}).get("vulnerabilities", []))
             pw_must_change = parsed.get("password_must_change", [])
 
-            # Check for transient errors that should trigger retry
-            transient_errors = [
-                "NETBIOS connection with the remote host timed out",
-                "Connection reset by peer",
-                "Connection timed out",
-                "Error enumerating shares",
-            ]
-            log_content = ""
-            try:
-                with open(log_path, "r", encoding="utf-8", errors="replace") as f:
-                    log_content = f.read()
-            except Exception:
-                pass
-
-            has_transient_error = any(
-                err.lower() in log_content.lower() for err in transient_errors
-            )
-
+            # Determine status based on results found
+            # Retry logic is handled by background.py before parsing
             if (
                 hosts_found > 0
                 or shares_found > 0
@@ -132,8 +116,6 @@ class CrackMapExecHandler(BaseToolHandler):
                 or len(pw_must_change) > 0
             ):
                 status = STATUS_DONE
-            elif has_transient_error:
-                status = STATUS_WARNING  # Transient error - may be retried
             else:
                 status = STATUS_NO_RESULTS
 

souleyez/handlers/dnsrecon_handler.py

@@ -4,6 +4,7 @@ DNSRecon handler.
 
 Consolidates parsing and display logic for DNSRecon DNS enumeration jobs.
 """
+
 import logging
 import os
 import re
@@ -44,9 +45,9 @@ class DNSReconHandler(BaseToolHandler):
         Extracts DNS records and stores them as OSINT data.
         """
         try:
+            from souleyez.engine.result_handler import detect_tool_error
             from souleyez.parsers.dnsrecon_parser import parse_dnsrecon_output
             from souleyez.storage.osint import OsintManager
-            from souleyez.engine.result_handler import detect_tool_error
 
             # Import managers if not provided
             if host_manager is None:

souleyez/handlers/enum4linux_handler.py

@@ -4,6 +4,7 @@ enum4linux handler.
 
 Consolidates parsing and display logic for enum4linux SMB/Samba enumeration jobs.
 """
+
 import logging
 import os
 import re
@@ -11,7 +12,7 @@ from typing import Any, Dict, Optional
 
 import click
 
-from souleyez.engine.job_status import STATUS_DONE, STATUS_WARNING, STATUS_NO_RESULTS
+from souleyez.engine.job_status import STATUS_DONE, STATUS_NO_RESULTS, STATUS_WARNING
 from souleyez.handlers.base import BaseToolHandler
 
 logger = logging.getLogger(__name__)
@@ -44,12 +45,12 @@ class Enum4LinuxHandler(BaseToolHandler):
         Extracts SMB users, groups, shares and stores them.
         """
         try:
+            from souleyez.engine.result_handler import detect_tool_error
             from souleyez.parsers.enum4linux_parser import (
-                parse_enum4linux_output,
-                get_smb_stats,
                 categorize_share,
+                get_smb_stats,
+                parse_enum4linux_output,
             )
-            from souleyez.engine.result_handler import detect_tool_error
 
             # Import managers if not provided
             if host_manager is None:
@@ -103,46 +104,71 @@ class Enum4LinuxHandler(BaseToolHandler):
                 )
                 credentials_added += 1
 
-            # Store shares as findings
+            # Store shares in smb_shares table (proper storage)
+            from souleyez.storage.smb_shares import SMBSharesManager
+
+            smb_mgr = SMBSharesManager()
+            shares_added = 0
             findings_added = 0
+
             for share in parsed.get("shares", []):
                 category = categorize_share(share)
-                if category == "open":
-                    severity = "high"
-                elif category == "readable":
-                    severity = "medium"
-                elif category == "restricted":
-                    severity = "low"
-                else:
-                    severity = "info"
-
                 share_name = share["name"]
                 share_type = share.get("type", "Unknown")
                 mapping = share.get("mapping", "N/A")
-
-                if mapping == "OK":
-                    listing = share.get("listing", "N/A")
-                    writing = share.get("writing", "N/A")
-                    access_desc = (
-                        f"Mapping={mapping}, Listing={listing}, Writing={writing}"
+                listing = share.get("listing", "N/A")
+                writing = share.get("writing", "N/A")
+
+                # Determine readable/writable status
+                readable = mapping == "OK" and listing in ("OK", "N/A")
+                writable = mapping == "OK" and writing == "OK"
+
+                # Store in smb_shares table
+                if host_id:
+                    try:
+                        smb_mgr.add_share(
+                            host_id=host_id,
+                            share_data={
+                                "name": share_name,
+                                "type": share_type,
+                                "permissions": f"{mapping}/{listing}/{writing}",
+                                "comment": share.get("comment", ""),
+                                "readable": readable,
+                                "writable": writable,
+                            },
+                        )
+                        shares_added += 1
+                    except Exception as e:
+                        logger.debug(f"Could not store share in smb_shares: {e}")
+
+                # Also add a finding for high-risk shares (writable or open)
+                if category == "open" or writable:
+                    if category == "open":
+                        severity = "high"
+                    elif writable:
+                        severity = "medium"
+                    else:
+                        severity = "low"
+
+                    title = f"Writable SMB Share: {share_name}"
+                    description = (
+                        f"Share: {share_name}\n"
+                        f"Type: {share_type}\n"
+                        f"Comment: {share.get('comment', 'N/A')}\n"
+                        f"Readable: {readable}, Writable: {writable}"
                     )
-                else:
-                    access_desc = f"Access denied (Mapping={mapping})"
 
-                title = f"SMB Share: {share_name} ({share_type})"
-                description = f"Share: {share_name}\nType: {share_type}\nComment: {share.get('comment', 'N/A')}\nAccess: {access_desc}"
-
-                findings_manager.add_finding(
-                    engagement_id=engagement_id,
-                    host_id=host_id,
-                    title=title,
-                    finding_type="smb_share",
-                    severity=severity,
-                    description=description,
-                    tool="enum4linux",
-                    port=445,
-                )
-                findings_added += 1
+                    findings_manager.add_finding(
+                        engagement_id=engagement_id,
+                        host_id=host_id,
+                        title=title,
+                        finding_type="smb_share",
+                        severity=severity,
+                        description=description,
+                        tool="enum4linux",
+                        port=445,
+                    )
+                    findings_added += 1
 
             stats = get_smb_stats(parsed)
 
@@ -158,7 +184,8 @@ class Enum4LinuxHandler(BaseToolHandler):
 
             # Determine status
             has_results = (
-                findings_added > 0
+                shares_added > 0
+                or findings_added > 0
                 or credentials_added > 0
                 or len(parsed.get("users", [])) > 0
                 or stats["total_shares"] > 0
@@ -177,6 +204,7 @@ class Enum4LinuxHandler(BaseToolHandler):
             return {
                 "tool": "enum4linux",
                 "status": status,
+                "shares_added": shares_added,
                 "findings_added": findings_added,
                 "credentials_added": credentials_added,
                 "users_found": len(parsed.get("users", [])),

souleyez/handlers/evil_winrm_handler.py

@@ -4,6 +4,7 @@ Evil-WinRM handler.
 
 Consolidates parsing and display logic for Evil-WinRM jobs.
 """
+
 import logging
 import os
 import re

souleyez/handlers/ffuf_handler.py

@@ -4,6 +4,7 @@ Ffuf handler.
 
 Consolidates parsing and display logic for ffuf fuzzing jobs.
 """
+
 import logging
 import os
 import re
@@ -186,8 +187,8 @@ class FfufHandler(BaseToolHandler):
         Extracts discovered paths and stores them in the database.
         """
         try:
-            from souleyez.parsers.ffuf_parser import parse_ffuf
             from souleyez.engine.result_handler import detect_tool_error
+            from souleyez.parsers.ffuf_parser import parse_ffuf
 
             # Import managers if not provided
             if host_manager is None:
@@ -344,6 +345,7 @@ class FfufHandler(BaseToolHandler):
         decode the base64, and parse for credentials.
         """
         import base64
+
         import requests
 
         extracted_creds = []

souleyez/handlers/gobuster_handler.py

@@ -4,18 +4,19 @@ Gobuster handler.
 
 Consolidates parsing and display logic for Gobuster directory enumeration jobs.
 """
+
 import logging
 import os
 import re
-import ssl
 import socket
-import urllib.request
+import ssl
 import urllib.error
+import urllib.request
 from typing import Any, Dict, List, Optional
-from urllib.parse import urlparse, urljoin
-import defusedxml.ElementTree as ElementTree  # Safe XML parsing
+from urllib.parse import urljoin, urlparse
 
 import click
+import defusedxml.ElementTree as ElementTree  # Safe XML parsing
 
 from souleyez.engine.job_status import (
     STATUS_DONE,
@@ -201,11 +202,11 @@ class GobusterHandler(BaseToolHandler):
         Extracts discovered paths and stores them in the database.
         """
         try:
+            from souleyez.engine.result_handler import detect_tool_error
             from souleyez.parsers.gobuster_parser import (
-                parse_gobuster_output,
                 get_paths_stats,
+                parse_gobuster_output,
             )
-            from souleyez.engine.result_handler import detect_tool_error
 
             # Import managers if not provided
             if host_manager is None:

souleyez/handlers/gpp_extract_handler.py

@@ -4,6 +4,7 @@ GPP Extract handler.
 
 Handles parsing and credential storage for GPP (Group Policy Preferences) extraction jobs.
 """
+
 import logging
 import os
 import re