souleyez 2.43.29__py3-none-any.whl → 3.0.0__py3-none-any.whl

souleyez/commands/screenshots.py

@@ -1,6 +1,7 @@
 """
 CLI commands for screenshot management.
 """
+
 import click
 from pathlib import Path
 from rich.console import Console
@@ -21,12 +22,12 @@ def screenshots():
 
 
 @screenshots.command()
-@click.argument('source', type=click.Path(exists=True))
-@click.option('--title', '-t', help='Screenshot title')
-@click.option('--description', '-d', help='Screenshot description')
-@click.option('--host', '-h', type=int, help='Link to host ID')
-@click.option('--finding', '-f', type=int, help='Link to finding ID')
-@click.option('--job', '-j', type=int, help='Link to job ID')
+@click.argument("source", type=click.Path(exists=True))
+@click.option("--title", "-t", help="Screenshot title")
+@click.option("--description", "-d", help="Screenshot description")
+@click.option("--host", "-h", type=int, help="Link to host ID")
+@click.option("--finding", "-f", type=int, help="Link to finding ID")
+@click.option("--job", "-j", type=int, help="Link to job ID")
 def add(source, title, description, host, finding, job):
     """Add a screenshot to current engagement."""
     em = EngagementManager()
@@ -39,13 +40,13 @@ def add(source, title, description, host, finding, job):
 
     try:
         screenshot_id = sm.add_screenshot(
-            engagement_id=current['id'],
+            engagement_id=current["id"],
             source_path=source,
             title=title,
             description=description,
             host_id=host,
             finding_id=finding,
-            job_id=job
+            job_id=job,
         )
 
         console.print(f"[green]✓ Screenshot added: ID {screenshot_id}[/green]")
@@ -64,9 +65,9 @@ def add(source, title, description, host, finding, job):
 
 
 @screenshots.command()
-@click.option('--host', '-h', type=int, help='Filter by host ID')
-@click.option('--finding', '-f', type=int, help='Filter by finding ID')
-@click.option('--job', '-j', type=int, help='Filter by job ID')
+@click.option("--host", "-h", type=int, help="Filter by host ID")
+@click.option("--finding", "-f", type=int, help="Filter by finding ID")
+@click.option("--job", "-j", type=int, help="Filter by job ID")
 def list(host, finding, job):
     """List screenshots for current engagement."""
     em = EngagementManager()
@@ -78,10 +79,7 @@ def list(host, finding, job):
         return
 
     screenshots = sm.list_screenshots(
-        engagement_id=current['id'],
-        host_id=host,
-        finding_id=finding,
-        job_id=job
+        engagement_id=current["id"], host_id=host, finding_id=finding, job_id=job
     )
 
     if not screenshots:
@@ -97,7 +95,7 @@ def list(host, finding, job):
     table.add_column("Created", style="blue")
 
     for s in screenshots:
-        size = s['file_size']
+        size = s["file_size"]
         if size < 1024:
             size_str = f"{size} B"
         elif size < 1024 * 1024:
@@ -106,21 +104,21 @@ def list(host, finding, job):
             size_str = f"{size / (1024 * 1024):.1f} MB"
 
         links = []
-        if s['host_id']:
+        if s["host_id"]:
             links.append(f"Host:{s['host_id']}")
-        if s['finding_id']:
+        if s["finding_id"]:
             links.append(f"Finding:{s['finding_id']}")
-        if s['job_id']:
+        if s["job_id"]:
             links.append(f"Job:{s['job_id']}")
         links_str = ", ".join(links) if links else "None"
 
         table.add_row(
-            str(s['id']),
-            s['title'] or s['filename'],
-            s['filename'][:30] + "..." if len(s['filename']) > 30 else s['filename'],
+            str(s["id"]),
+            s["title"] or s["filename"],
+            s["filename"][:30] + "..." if len(s["filename"]) > 30 else s["filename"],
             size_str,
             links_str,
-            s['created_at'][:10]
+            s["created_at"][:10],
         )
 
     console.print(table)
@@ -128,30 +126,36 @@ def list(host, finding, job):
 
 
 @screenshots.command()
-@click.argument('screenshot_id', type=int)
-@click.option('--host', '-h', type=int, help='Link to host ID')
-@click.option('--finding', '-f', type=int, help='Link to finding ID')
-@click.option('--job', '-j', type=int, help='Link to job ID')
+@click.argument("screenshot_id", type=int)
+@click.option("--host", "-h", type=int, help="Link to host ID")
+@click.option("--finding", "-f", type=int, help="Link to finding ID")
+@click.option("--job", "-j", type=int, help="Link to job ID")
 def link(screenshot_id, host, finding, job):
     """Link screenshot to host/finding/job."""
     sm = ScreenshotManager()
 
     if host:
         sm.link_to_host(screenshot_id, host)
-        console.print(f"[green]✓ Linked screenshot {screenshot_id} to host {host}[/green]")
+        console.print(
+            f"[green]✓ Linked screenshot {screenshot_id} to host {host}[/green]"
+        )
 
     if finding:
         sm.link_to_finding(screenshot_id, finding)
-        console.print(f"[green]✓ Linked screenshot {screenshot_id} to finding {finding}[/green]")
+        console.print(
+            f"[green]✓ Linked screenshot {screenshot_id} to finding {finding}[/green]"
+        )
 
     if job:
         sm.link_to_job(screenshot_id, job)
-        console.print(f"[green]✓ Linked screenshot {screenshot_id} to job {job}[/green]")
+        console.print(
+            f"[green]✓ Linked screenshot {screenshot_id} to job {job}[/green]"
+        )
 
 
 @screenshots.command()
-@click.argument('screenshot_id', type=int)
-@click.confirmation_option(prompt='Are you sure you want to delete this screenshot?')
+@click.argument("screenshot_id", type=int)
+@click.confirmation_option(prompt="Are you sure you want to delete this screenshot?")
 def delete(screenshot_id):
     """Delete a screenshot."""
     sm = ScreenshotManager()

souleyez/commands/user.py

@@ -8,6 +8,7 @@ Commands (admin only):
 - souleyez user delete <username>   - Delete user
 - souleyez user passwd [username]   - Change password
 """
+
 import click
 import getpass
 from rich.console import Console
@@ -45,14 +46,20 @@ def user():
 @require_admin
 @click.argument("username")
 @click.option("--email", "-e", help="User email address")
-@click.option("--role", "-r",
-              type=click.Choice(["admin", "lead", "analyst", "viewer"]),
-              default="analyst",
-              help="User role (default: analyst)")
-@click.option("--tier", "-t",
-              type=click.Choice(["FREE", "PRO"]),
-              default=None,
-              help="License tier (auto-detects from active license)")
+@click.option(
+    "--role",
+    "-r",
+    type=click.Choice(["admin", "lead", "analyst", "viewer"]),
+    default="analyst",
+    help="User role (default: analyst)",
+)
+@click.option(
+    "--tier",
+    "-t",
+    type=click.Choice(["FREE", "PRO"]),
+    default=None,
+    help="License tier (auto-detects from active license)",
+)
 def user_create(username, email, role, tier):
     """Create a new user account."""
     import secrets
@@ -77,7 +84,7 @@ def user_create(username, email, role, tier):
         email=email,
         role=Role(role),
         tier=Tier(tier),
-        skip_password_validation=True  # Generated password is secure
+        skip_password_validation=True,  # Generated password is secure
     )
 
     if new_user is None:
@@ -86,8 +93,12 @@ def user_create(username, email, role, tier):
 
     # Log the action
     current = get_current_user()
-    _log_audit("user.created", current.id, current.username,
-               f"Created user: {username} (role={role}, tier={tier})")
+    _log_audit(
+        "user.created",
+        current.id,
+        current.username,
+        f"Created user: {username} (role={role}, tier={tier})",
+    )
 
     # Display credentials in a nice panel
     tier_display = "💎 PRO" if tier == "PRO" else "FREE"
@@ -101,7 +112,9 @@ def user_create(username, email, role, tier):
         f"[dim]To change password after login:[/dim]\n"
         f"[dim]  • souleyez user passwd {username}[/dim]"
     )
-    console.print(Panel(panel_content, title="🔐 New User Created", border_style="green"))
+    console.print(
+        Panel(panel_content, title="🔐 New User Created", border_style="green")
+    )
 
 
 @user.command("list")
@@ -130,7 +143,11 @@ def user_list(show_all):
         status = "[green]Active[/green]" if u.is_active else "[red]Disabled[/red]"
         if u.is_locked:
             status = "[yellow]Locked[/yellow]"
-        last_login = u.last_login.strftime('%Y-%m-%d %H:%M') if u.last_login else "[dim]Never[/dim]"
+        last_login = (
+            u.last_login.strftime("%Y-%m-%d %H:%M")
+            if u.last_login
+            else "[dim]Never[/dim]"
+        )
 
         table.add_row(
             u.username,
@@ -138,7 +155,7 @@ def user_list(show_all):
             tier_badge,
             u.email or "[dim]-[/dim]",
             status,
-            last_login
+            last_login,
         )
 
     console.print(table)
@@ -149,14 +166,17 @@ def user_list(show_all):
 @require_login
 @require_admin
 @click.argument("username")
-@click.option("--role", "-r",
-              type=click.Choice(["admin", "lead", "analyst", "viewer"]),
-              help="New role")
-@click.option("--tier", "-t",
-              type=click.Choice(["FREE", "PRO"]),
-              help="New tier")
+@click.option(
+    "--role",
+    "-r",
+    type=click.Choice(["admin", "lead", "analyst", "viewer"]),
+    help="New role",
+)
+@click.option("--tier", "-t", type=click.Choice(["FREE", "PRO"]), help="New tier")
 @click.option("--email", "-e", help="New email")
-@click.option("--activate/--deactivate", default=None, help="Activate or deactivate account")
+@click.option(
+    "--activate/--deactivate", default=None, help="Activate or deactivate account"
+)
 def user_update(username, role, tier, email, activate):
     """Update a user's role, tier, or status."""
     user_mgr = _get_user_manager()
@@ -178,7 +198,9 @@ def user_update(username, role, tier, email, activate):
         updates["is_active"] = activate
 
     if not updates:
-        console.print("[yellow]No changes specified. Use --role, --tier, --email, or --activate/--deactivate[/yellow]")
+        console.print(
+            "[yellow]No changes specified. Use --role, --tier, --email, or --activate/--deactivate[/yellow]"
+        )
         return
 
     success, error = user_mgr.update_user(target.id, **updates)
@@ -189,8 +211,12 @@ def user_update(username, role, tier, email, activate):
 
     # Log the action
     current = get_current_user()
-    _log_audit("user.updated", current.id, current.username,
-               f"Updated user: {username} ({updates})")
+    _log_audit(
+        "user.updated",
+        current.id,
+        current.username,
+        f"Updated user: {username} ({updates})",
+    )
 
     console.print(f"[green]✅ User '{username}' updated successfully![/green]")
 
@@ -227,8 +253,9 @@ def user_delete(username, force):
         console.print(f"[red]❌ {error}[/red]")
         return
 
-    _log_audit("user.deleted", current.id, current.username,
-               f"Deleted user: {username}")
+    _log_audit(
+        "user.deleted", current.id, current.username, f"Deleted user: {username}"
+    )
 
     console.print(f"[green]✅ User '{username}' deleted[/green]")
 
@@ -245,7 +272,9 @@ def user_passwd(username):
     if username:
         # Changing another user's password - requires admin
         if current.role != Role.ADMIN:
-            console.print("[red]❌ Admin privileges required to change another user's password[/red]")
+            console.print(
+                "[red]❌ Admin privileges required to change another user's password[/red]"
+            )
             return
         target = user_mgr.get_user_by_username(username)
         if target is None:
@@ -283,8 +312,12 @@ def user_passwd(username):
         console.print(f"[red]❌ {error}[/red]")
         return
 
-    _log_audit("user.password_changed", current.id, current.username,
-               f"Password changed for: {username}")
+    _log_audit(
+        "user.password_changed",
+        current.id,
+        current.username,
+        f"Password changed for: {username}",
+    )
 
     console.print(f"[green]✅ Password changed successfully![/green]")
 
@@ -315,8 +348,12 @@ def user_upgrade(username, reason):
         console.print(f"[red]❌ {error}[/red]")
         return
 
-    _log_audit("user.tier_upgraded", current.id, current.username,
-               f"Upgraded '{username}' to PRO. Reason: {reason}")
+    _log_audit(
+        "user.tier_upgraded",
+        current.id,
+        current.username,
+        f"Upgraded '{username}' to PRO. Reason: {reason}",
+    )
 
     console.print(f"[green]✅ User '{username}' upgraded to 💎 PRO[/green]")
     console.print(f"   Reason: {reason}")
@@ -344,7 +381,9 @@ def user_downgrade(username, reason, force):
 
     # Confirm downgrade
     if not force:
-        console.print(f"\n[yellow]⚠️  This will remove Pro features for '{username}'[/yellow]")
+        console.print(
+            f"\n[yellow]⚠️  This will remove Pro features for '{username}'[/yellow]"
+        )
         if not click.confirm("Continue?"):
             console.print("[dim]Cancelled[/dim]")
             return
@@ -356,8 +395,12 @@ def user_downgrade(username, reason, force):
         console.print(f"[red]❌ {error}[/red]")
         return
 
-    _log_audit("user.tier_downgraded", current.id, current.username,
-               f"Downgraded '{username}' to FREE. Reason: {reason}")
+    _log_audit(
+        "user.tier_downgraded",
+        current.id,
+        current.username,
+        f"Downgraded '{username}' to FREE. Reason: {reason}",
+    )
 
     console.print(f"[green]✅ User '{username}' downgraded to FREE[/green]")
     console.print(f"   Reason: {reason}")
@@ -371,10 +414,13 @@ def _log_audit(action: str, user_id: str, username: str, details: str = None):
 
     try:
         conn = sqlite3.connect(get_db().db_path)
-        conn.execute("""
+        conn.execute(
+            """
             INSERT INTO audit_log (user_id, username, action, details, timestamp)
             VALUES (?, ?, ?, ?, ?)
-        """, (user_id, username, action, details, datetime.now().isoformat()))
+        """,
+            (user_id, username, action, details, datetime.now().isoformat()),
+        )
         conn.commit()
         conn.close()
     except Exception:

souleyez/config.py

@@ -28,29 +28,34 @@ CONFIG_PATH = Path.home() / ".souleyez" / "config.json"
 
 DEFAULT_CONFIG = {
     "plugins": {"enabled": [], "disabled": []},
-    "settings": {"wordlists": None, "proxy": None, "threads": 10, "ollama_model": "llama3.1:8b"},
+    "settings": {
+        "wordlists": None,
+        "proxy": None,
+        "threads": 10,
+        "ollama_model": "llama3.1:8b",
+    },
     "database": {
         "path": "~/.souleyez/souleyez.db",
         "backup_enabled": True,
-        "backup_interval_hours": 24
+        "backup_interval_hours": 24,
     },
     "crypto": {
         "algorithm": "AES-256-GCM",
         "iterations": 600000,
-        "key_derivation": "PBKDF2"
+        "key_derivation": "PBKDF2",
     },
     "logging": {
         "level": "INFO",
         "format": "json",
         "file": "~/.souleyez/souleyez.log",
         "max_bytes": 10485760,
-        "backup_count": 5
+        "backup_count": 5,
     },
     "security": {
         "session_timeout_minutes": 30,
         "max_login_attempts": 5,
         "lockout_duration_minutes": 15,
-        "min_password_length": 12
+        "min_password_length": 12,
     },
     "ai": {
         "provider": "ollama",  # "ollama" or "claude"
@@ -65,7 +70,7 @@ DEFAULT_CONFIG = {
         # AI Chain Advisor settings
         "chain_mode": "suggest",  # "off", "suggest", or "auto"
         "chain_min_confidence": 0.6,  # Minimum confidence for AI recommendations
-        "chain_max_recommendations": 5  # Max AI suggestions per analysis
+        "chain_max_recommendations": 5,  # Max AI suggestions per analysis
     },
     # MSF RPC Configuration (Pro feature)
     "msfrpc": {
@@ -78,8 +83,8 @@ DEFAULT_CONFIG = {
         "timeout": 30,  # Connection timeout in seconds
         "poll_interval": 2,  # Seconds between session polls
         "max_poll_time": 300,  # Max time to wait for session (5 min)
-        "fallback_to_console": True  # Use msfconsole if RPC unavailable
-    }
+        "fallback_to_console": True,  # Use msfconsole if RPC unavailable
+    },
 }
 
 CONFIG_SCHEMA = {
@@ -87,87 +92,86 @@ CONFIG_SCHEMA = {
         "type": int,
         "min": 100000,
         "max": 10000000,
-        "error": "Iterations must be between 100k and 10M for security"
+        "error": "Iterations must be between 100k and 10M for security",
     },
     "database.path": {
         "type": str,
-        "validator": lambda p: not p.startswith(
-            ("http://", "https://", "ftp://")
-        ),
-        "error": "Database path must be local filesystem"
+        "validator": lambda p: not p.startswith(("http://", "https://", "ftp://")),
+        "error": "Database path must be local filesystem",
     },
     "logging.level": {
         "type": str,
         "allowed": ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
-        "error": "Invalid log level"
+        "error": "Invalid log level",
     },
     "security.max_login_attempts": {
         "type": int,
         "min": 1,
         "max": 10,
-        "error": "Max login attempts must be 1-10"
+        "error": "Max login attempts must be 1-10",
     },
     "security.session_timeout_minutes": {
         "type": int,
         "min": 5,
         "max": 1440,
-        "error": "Session timeout must be 5-1440 minutes"
+        "error": "Session timeout must be 5-1440 minutes",
     },
     "settings.threads": {
         "type": int,
         "min": 1,
         "max": 100,
-        "error": "Threads must be 1-100"
+        "error": "Threads must be 1-100",
     },
     "ai.ollama_mode": {
         "type": str,
         "allowed": ["local", "remote"],
-        "error": "Ollama mode must be 'local' or 'remote'"
+        "error": "Ollama mode must be 'local' or 'remote'",
     },
     "ai.chain_mode": {
         "type": str,
         "allowed": ["off", "suggest", "auto"],
-        "error": "AI chain mode must be 'off', 'suggest', or 'auto'"
+        "error": "AI chain mode must be 'off', 'suggest', or 'auto'",
     },
     "ai.chain_min_confidence": {
         "type": float,
         "min": 0.0,
         "max": 1.0,
-        "error": "AI chain confidence must be 0.0-1.0"
+        "error": "AI chain confidence must be 0.0-1.0",
     },
     "ai.chain_max_recommendations": {
         "type": int,
         "min": 1,
         "max": 20,
-        "error": "AI chain max recommendations must be 1-20"
+        "error": "AI chain max recommendations must be 1-20",
     },
     # MSF RPC validation
     "msfrpc.port": {
         "type": int,
         "min": 1,
         "max": 65535,
-        "error": "MSF RPC port must be 1-65535"
+        "error": "MSF RPC port must be 1-65535",
     },
     "msfrpc.timeout": {
         "type": int,
         "min": 5,
         "max": 120,
-        "error": "MSF RPC timeout must be 5-120 seconds"
+        "error": "MSF RPC timeout must be 5-120 seconds",
     },
     "msfrpc.poll_interval": {
         "type": int,
         "min": 1,
         "max": 30,
-        "error": "Poll interval must be 1-30 seconds"
+        "error": "Poll interval must be 1-30 seconds",
     },
     "msfrpc.max_poll_time": {
         "type": int,
         "min": 30,
         "max": 600,
-        "error": "Max poll time must be 30-600 seconds"
-    }
+        "error": "Max poll time must be 30-600 seconds",
+    },
 }
 
+
 def _ensure_dir():
     CONFIG_PATH.parent.mkdir(parents=True, exist_ok=True)
 
@@ -177,7 +181,7 @@ def _get_nested(data: dict, key: str, default=None):
     Get nested dict value using dotted notation.
     Example: _get_nested(cfg, 'database.path') -> cfg['database']['path']
     """
-    parts = key.split('.')
+    parts = key.split(".")
     current = data
     for part in parts:
         if isinstance(current, dict) and part in current:
@@ -193,7 +197,7 @@ def _set_nested(data: dict, key: str, value):
     Example: _set_nested(cfg, 'database.path', '/foo')
         -> cfg['database']['path'] = '/foo'
     """
-    parts = key.split('.')
+    parts = key.split(".")
     current = data
     for part in parts[:-1]:
         if part not in current:
@@ -237,12 +241,14 @@ def validate_config(cfg: dict) -> tuple[bool, list[str]]:
 def _merge_with_defaults(cfg: dict) -> dict:
     """Deep merge user config with defaults."""
     import copy
+
     merged = copy.deepcopy(DEFAULT_CONFIG)
 
     def deep_merge(base, updates):
         for key, value in updates.items():
-            is_dict_merge = (key in base and isinstance(base[key], dict)
-                             and isinstance(value, dict))
+            is_dict_merge = (
+                key in base and isinstance(base[key], dict) and isinstance(value, dict)
+            )
             if is_dict_merge:
                 deep_merge(base[key], value)
             else:
@@ -252,7 +258,6 @@ def _merge_with_defaults(cfg: dict) -> dict:
     return merged
 
 
-
 def _normalize(data: dict) -> dict:
     # Accept both new {"plugins":{...}}
     # and old flat {"enabled":[], "disabled":[]}
@@ -264,7 +269,12 @@ def _normalize(data: dict) -> dict:
         plugins.setdefault("disabled", [])
         data.setdefault(
             "settings",
-            {"wordlists": None, "proxy": None, "threads": 10, "ollama_model": "llama3.1:8b"}
+            {
+                "wordlists": None,
+                "proxy": None,
+                "threads": 10,
+                "ollama_model": "llama3.1:8b",
+            },
         )
         return data
     # old flat form
@@ -272,11 +282,15 @@ def _normalize(data: dict) -> dict:
     disabled = data.get("disabled", []) or []
     return {
         "plugins": {"enabled": enabled, "disabled": disabled},
-        "settings": {"wordlists": None, "proxy": None, "threads": 10, "ollama_model": "llama3.1:8b"}
+        "settings": {
+            "wordlists": None,
+            "proxy": None,
+            "threads": 10,
+            "ollama_model": "llama3.1:8b",
+        },
     }
 
 
-
 def read_config() -> dict:
     """
     Read and validate config from file.
@@ -292,8 +306,7 @@ def read_config() -> dict:
             return DEFAULT_CONFIG.copy()
         except Exception as e:
             logging.warning(
-                f"Cannot create config file: {e}. "
-                "Using defaults in memory."
+                f"Cannot create config file: {e}. " "Using defaults in memory."
             )
             return DEFAULT_CONFIG.copy()
 
@@ -312,12 +325,8 @@ def read_config() -> dict:
         return normalized
 
     except json.JSONDecodeError as e:
-        logging.error(
-            f"Corrupted config file at {CONFIG_PATH}: {e}"
-        )
-        logging.warning(
-            "Using default config. Fix or delete config file to reset."
-        )
+        logging.error(f"Corrupted config file at {CONFIG_PATH}: {e}")
+        logging.warning("Using default config. Fix or delete config file to reset.")
         return DEFAULT_CONFIG.copy()
     except Exception as e:
         logging.error(f"Error reading config: {e}")
@@ -339,7 +348,7 @@ def get(key: str, default=None):
         get('database.path') -> checks SOULEYEZ_DATABASE_PATH env,
         then config file, then default
     """
-    env_key = "SOULEYEZ_" + key.upper().replace('.', '_')
+    env_key = "SOULEYEZ_" + key.upper().replace(".", "_")
     env_val = os.getenv(env_key)
     if env_val is not None:
         return env_val
@@ -352,7 +361,6 @@ def get(key: str, default=None):
     return _get_nested(DEFAULT_CONFIG, key, default)
 
 
-
 def list_plugins_config() -> tuple[list[str], list[str]]:
     cfg = read_config()
     e = [x.lower() for x in cfg["plugins"]["enabled"]]