souleyez 2.17.0__py3-none-any.whl → 2.23.0__py3-none-any.whl

souleyez/plugins/gobuster.py

@@ -154,6 +154,83 @@ class GobusterPlugin(PluginBase):
     category = "scanning"
     HELP = HELP
 
+    # Minimum required version (v3.x uses subcommands like 'dir', 'dns', 'vhost')
+    MIN_VERSION = "3.0.0"
+
+    def _check_version(self) -> tuple:
+        """
+        Check gobuster version meets minimum requirements.
+
+        Returns:
+            (meets_requirement: bool, version: str, error_msg: str or None)
+        """
+        try:
+            # Use -v flag (not 'version' subcommand) - works on v3.x
+            result = subprocess.run(
+                ["gobuster", "-v"],
+                capture_output=True,
+                text=True,
+                timeout=10
+            )
+            output = result.stdout + result.stderr
+
+            # Parse version from output like "gobuster version 3.8.2"
+            version_match = re.search(r'version\s+(\d+\.\d+\.\d+)', output, re.IGNORECASE)
+            if version_match:
+                version = version_match.group(1)
+                major = int(version.split('.')[0])
+                if major >= 3:
+                    return (True, version, None)
+                else:
+                    return (False, version, self._upgrade_message(version))
+
+            # Also try --version flag as fallback
+            result2 = subprocess.run(
+                ["gobuster", "--version"],
+                capture_output=True,
+                text=True,
+                timeout=10
+            )
+            output2 = result2.stdout + result2.stderr
+            version_match2 = re.search(r'version\s+(\d+\.\d+\.\d+)', output2, re.IGNORECASE)
+            if version_match2:
+                version = version_match2.group(1)
+                major = int(version.split('.')[0])
+                if major >= 3:
+                    return (True, version, None)
+                else:
+                    return (False, version, self._upgrade_message(version))
+
+            # If neither flag shows version info, check if v2.x by looking for subcommand error
+            # v2.x will show "Usage: gobuster [OPTIONS] ..." without subcommands
+            if "dir" not in output.lower() and "dns" not in output.lower():
+                return (False, "2.x", self._upgrade_message("2.x"))
+
+            # If we see dir/dns subcommands mentioned, assume v3.x
+            return (True, "3.x", None)
+
+        except FileNotFoundError:
+            return (False, None, "ERROR: gobuster not found. Install with: sudo apt install gobuster")
+        except subprocess.TimeoutExpired:
+            return (True, "unknown", None)  # Assume it works
+        except Exception as e:
+            return (True, "unknown", None)  # Assume it works
+
+    def _upgrade_message(self, current_version: str) -> str:
+        """Generate upgrade instructions for old gobuster versions."""
+        return (
+            f"ERROR: gobuster {current_version} is too old. Version 3.0.0+ required.\n\n"
+            f"Gobuster v2.x doesn't support the 'dir/dns/vhost' subcommands used by SoulEyez.\n\n"
+            f"UPGRADE OPTIONS:\n"
+            f"  Option 1 - Install from Go (recommended, gets latest):\n"
+            f"    go install github.com/OJ/gobuster/v3@latest\n\n"
+            f"  Option 2 - Download binary from GitHub:\n"
+            f"    https://github.com/OJ/gobuster/releases\n\n"
+            f"  Option 3 - On Kali Linux:\n"
+            f"    sudo apt update && sudo apt install gobuster\n\n"
+            f"After upgrading, verify with: gobuster version\n"
+        )
+
     def _preflight_check(self, base_url: str, timeout: float = 5.0, log_path: str = None) -> Dict[str, Optional[str]]:
         """
         Probe target with random UUID path to detect false positive responses.
@@ -225,7 +302,15 @@ class GobusterPlugin(PluginBase):
     def build_command(self, target: str, args: List[str] = None, label: str = "", log_path: str = None):
         """Build gobuster command for background execution with PID tracking."""
         args = args or []
-        
+
+        # Check gobuster version meets requirements (v3.x+ required for subcommands)
+        meets_req, version, error_msg = self._check_version()
+        if not meets_req:
+            if log_path:
+                with open(log_path, 'w') as f:
+                    f.write(error_msg)
+            return None
+
         # Detect the mode from args
         mode = None
         if 'dir' in args:
@@ -323,9 +408,17 @@ class GobusterPlugin(PluginBase):
 
     def run(self, target: str, args: List[str] = None, label: str = "", log_path: str = None) -> int:
         """Execute gobuster scan and write output to log_path."""
-        
+
         args = args or []
-        
+
+        # Check gobuster version meets requirements (v3.x+ required for subcommands)
+        meets_req, version, error_msg = self._check_version()
+        if not meets_req:
+            if log_path:
+                with open(log_path, 'w') as f:
+                    f.write(error_msg)
+            return 1
+
         # Detect the mode from args
         mode = None
         if 'dir' in args:

souleyez/plugins/msf_exploit.py

@@ -295,13 +295,16 @@ class MsfExploitPlugin(PluginBase):
                     with open(log_path, 'a') as f:
                         f.write(f"[!] Poll error: {e}\n")
 
-        # Timeout - no session opened
+        # Timeout - no session opened (not an error, just means target likely not vulnerable)
         if log_path:
             with open(log_path, 'a') as f:
-                f.write(f"\n[-] No session opened after {max_poll}s\n")
+                f.write(f"\n[*] No session opened after {max_poll}s\n")
+                f.write(f"[*] Target may not be vulnerable or exploit conditions not met\n")
+                f.write(f"[*] Try re-running the exploit if needed\n")
                 f.write(f"Completed: {time.strftime('%Y-%m-%d %H:%M:%S UTC', time.gmtime())}\n")
 
-        return {'success': False, 'error': f'No session after {max_poll}s'}
+        # Return success=False but no 'error' key - this is a "no results" case, not an error
+        return {'success': False, 'no_session': True, 'reason': f'No session after {max_poll}s'}
 
     def _get_local_ip(self, target: str) -> str:
         """Get local IP that can reach the target."""

souleyez/ui/interactive.py

@@ -9694,9 +9694,19 @@ def _view_all_job_alerts(item: dict):
                 return f"{icon} {severity[:6].upper()}"
         elif key == 'rule_id':
             if is_wazuh_style:
-                return str(alert.get('rule', {}).get('id', 'N/A'))
+                # Wazuh: show first rule group (more descriptive) or rule ID
+                rule_data = alert.get('rule', {})
+                groups = rule_data.get('groups', [])
+                if groups:
+                    # Get most specific group (often last is most specific)
+                    return str(groups[-1])[:12]
+                return str(rule_data.get('id', 'N/A'))[:12]
             else:
-                return str(alert.get('rule_id', alert.get('id', 'N/A')))[:15]
+                # Splunk: show MITRE tactic if available, else sourcetype
+                mitre_tactics = alert.get('mitre_tactics', [])
+                if mitre_tactics:
+                    return str(mitre_tactics[0])[:12]
+                return str(alert.get('rule_id', 'N/A'))[:12]
         elif key == 'agent_name':
             if is_wazuh_style:
                 return alert.get('agent', {}).get('name', 'N/A')
@@ -9704,9 +9714,17 @@ def _view_all_job_alerts(item: dict):
                 return str(alert.get('source_ip', alert.get('host', 'N/A')))[:15]
         elif key == 'description':
             if is_wazuh_style:
-                return alert.get('rule', {}).get('description', 'No description')[:45]
+                # Wazuh: use rule description, or rule groups if more descriptive
+                rule_data = alert.get('rule', {})
+                desc = rule_data.get('description', '')
+                if not desc:
+                    groups = rule_data.get('groups', [])
+                    if groups:
+                        desc = ', '.join(groups[:2])
+                return str(desc)[:45] if desc else 'No description'
             else:
-                desc = alert.get('rule_name', alert.get('description', 'No description'))
+                # Splunk: prefer actual description (log content) over rule_name
+                desc = alert.get('description', '') or alert.get('rule_name', '')
                 return str(desc)[:45] if desc else 'No description'
         elif key == 'timestamp':
             ts = alert.get('timestamp', 'N/A')
@@ -9718,9 +9736,9 @@ def _view_all_job_alerts(item: dict):
     columns = [
         {'name': '#', 'width': 5, 'key': '_idx'},
         {'name': 'Level', 'width': 10, 'key': 'level_display'},
-        {'name': 'Rule', 'width': 8, 'key': 'rule_id'},
+        {'name': 'Type', 'width': 14, 'key': 'rule_id'},
         {'name': 'Agent', 'width': 15, 'key': 'agent_name'},
-        {'name': 'Description', 'width': 45, 'key': 'description'},
+        {'name': 'Description', 'width': 42, 'key': 'description'},
         {'name': 'Time', 'width': 20, 'key': 'timestamp'},
     ]
 
@@ -29508,11 +29526,11 @@ def _check_msfdb_ready() -> bool:
         click.echo("  The Metasploit database needs to be initialized for full functionality.")
         click.echo("  Without it, you won't be able to store hosts, credentials, or loot.")
         click.echo()
-        if click.confirm("  Initialize database now? (runs: msfdb init)", default=True):
+        if click.confirm("  Initialize database now? (runs: sudo msfdb init)", default=True):
             click.echo()
-            click.echo(click.style("  Running msfdb init...", fg='cyan'))
+            click.echo(click.style("  Running sudo msfdb init...", fg='cyan'))
             try:
-                result = subprocess.run(['msfdb', 'init'], capture_output=False, text=True)
+                result = subprocess.run(['sudo', 'msfdb', 'init'], capture_output=False, text=True)
                 if result.returncode == 0:
                     click.echo(click.style("  Database initialized successfully!", fg='green'))
                     click.echo()
@@ -31347,13 +31365,13 @@ def run_interactive_menu():
     click.echo("└" + "─" * (width - 2) + "┘")
     click.echo("\n")
     
-    # ASCII Art Banner - SOULEYEZ
-    click.echo(click.style("   ███████╗ ██████╗ ██╗   ██╗██╗     ███████╗██╗   ██╗███████╗███████╗", fg='bright_cyan', bold=True))
-    click.echo(click.style("   ██╔════╝██╔═══██╗██║   ██║██║     ██╔════╝╚██╗ ██╔╝██╔════╝╚══███╔╝", fg='bright_cyan', bold=True))
-    click.echo(click.style("   ███████╗██║   ██║██║   ██║██║     █████╗   ╚████╔╝ █████╗    ███╔╝ ", fg='bright_cyan', bold=True))
-    click.echo(click.style("   ╚════██║██║   ██║██║   ██║██║     ██╔══╝    ╚██╔╝  ██╔══╝   ███╔╝  ", fg='bright_cyan', bold=True))
-    click.echo(click.style("   ███████║╚██████╔╝╚██████╔╝███████╗███████╗   ██║   ███████╗███████╗", fg='bright_cyan', bold=True))
-    click.echo(click.style("   ╚══════╝ ╚═════╝  ╚═════╝ ╚══════╝╚══════╝   ╚═╝   ╚══════╝╚══════╝", fg='bright_cyan', bold=True))
+    # ASCII Art Banner - SOULEYEZ with all-seeing eye on the right
+    click.echo(click.style("   ███████╗ ██████╗ ██╗   ██╗██╗     ███████╗██╗   ██╗███████╗███████╗", fg='bright_cyan', bold=True) + click.style("        ▄██▄", fg='bright_blue', bold=True))
+    click.echo(click.style("   ██╔════╝██╔═══██╗██║   ██║██║     ██╔════╝╚██╗ ██╔╝██╔════╝╚══███╔╝", fg='bright_cyan', bold=True) + click.style("      ▄█▀  ▀█▄", fg='bright_blue', bold=True))
+    click.echo(click.style("   ███████╗██║   ██║██║   ██║██║     █████╗   ╚████╔╝ █████╗    ███╔╝ ", fg='bright_cyan', bold=True) + click.style("     █   ◉   █", fg='bright_blue', bold=True))
+    click.echo(click.style("   ╚════██║██║   ██║██║   ██║██║     ██╔══╝    ╚██╔╝  ██╔══╝   ███╔╝  ", fg='bright_cyan', bold=True) + click.style("     █  ═══  █", fg='bright_blue', bold=True))
+    click.echo(click.style("   ███████║╚██████╔╝╚██████╔╝███████╗███████╗   ██║   ███████╗███████╗", fg='bright_cyan', bold=True) + click.style("      ▀█▄  ▄█▀", fg='bright_blue', bold=True))
+    click.echo(click.style("   ╚══════╝ ╚═════╝  ╚═════╝ ╚══════╝╚══════╝   ╚═╝   ╚══════╝╚══════╝", fg='bright_cyan', bold=True) + click.style("        ▀██▀", fg='bright_blue', bold=True))
     click.echo()
 
     # Tagline and description