detecti-cli 2.0.1__tar.gz → 2.0.3__tar.gz

{detecti_cli-2.0.1 → detecti_cli-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: detecti-cli
-Version: 2.0.1
+Version: 2.0.3
 Summary: Modern Attack Surface Management & Threat Intelligence Engine
 Author-email: "Lucas S. (Ls4ss)" <lucas@lucassouza.io>
 License: MIT
@@ -17,10 +17,10 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Security
 Requires-Python: >=3.11
+Requires-Dist: bcrypt>=4.0.0
 Requires-Dist: cve-searchsploit>=0.3.0
 Requires-Dist: fastapi>=0.104.0
 Requires-Dist: httpx>=0.27.0
-Requires-Dist: passlib[bcrypt]>=1.7.4
 Requires-Dist: psutil>=5.9.0
 Requires-Dist: pydantic-settings>=2.2.0
 Requires-Dist: pydantic>=2.7.0

{detecti_cli-2.0.1 → detecti_cli-2.0.3}/detecti/cli.py

@@ -31,10 +31,11 @@ def _compat_make_metavar(self, ctx=None):
 
 click.Option.make_metavar = _compat_make_metavar
 
+import importlib.metadata
 try:
-    from __init__ import __version__
-except (ImportError, ModuleNotFoundError):
-    __version__ = "2.0.0"
+    __version__ = importlib.metadata.version("detecti-cli")
+except importlib.metadata.PackageNotFoundError:
+    __version__ = "dev"
 
 from detecti.config import settings, DETECTI_HOME
 from detecti.core.engine import ThreatTrackEngine, DetectIEngine

{detecti_cli-2.0.1 → detecti_cli-2.0.3}/detecti/core/database/config_db.py

@@ -1,28 +1,18 @@
 import logging
 import sqlite3
 import hashlib
+import bcrypt
 from pathlib import Path
 
-# Suppress passlib bcrypt warning
-try:
-    import bcrypt
-    if not hasattr(bcrypt, "__about__"):
-        class AboutMock:
-            __version__ = bcrypt.__version__
-        bcrypt.__about__ = AboutMock()
-except ImportError:
-    pass
-
-from passlib.context import CryptContext
-from pydantic_settings import BaseSettings
-
-pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
-
 def get_password_hash(password: str) -> str:
-    return pwd_context.hash(password)
+    salt = bcrypt.gensalt()
+    return bcrypt.hashpw(password.encode('utf-8'), salt).decode('utf-8')
 
 def verify_password(plain_password: str, hashed_password: str) -> bool:
-    return pwd_context.verify(plain_password, hashed_password)
+    try:
+        return bcrypt.checkpw(plain_password.encode('utf-8'), hashed_password.encode('utf-8'))
+    except Exception:
+        return False
 
 class ConfigDBManager:
     def __init__(self, db_path: Path):
@@ -43,31 +33,34 @@ class ConfigDBManager:
             ''')
             conn.commit()
 
-    def create_user(self, username: str, password_hash: str, role: str = 'admin'):
+    def user_exists(self, username: str) -> bool:
+        with sqlite3.connect(self.db_path) as conn:
+            cursor = conn.execute("SELECT 1 FROM users WHERE username = ?", (username,))
+            return cursor.fetchone() is not None
+
+    def create_user(self, username: str, password_hash: str, role: str = "admin") -> bool:
         try:
             with sqlite3.connect(self.db_path) as conn:
-                conn.execute('''
-                    INSERT INTO users (username, password_hash, role)
-                    VALUES (?, ?, ?)
-                ''', (username, password_hash, role))
+                conn.execute(
+                    "INSERT INTO users (username, password_hash, role) VALUES (?, ?, ?)",
+                    (username, password_hash, role)
+                )
                 conn.commit()
-                return True
+            return True
         except sqlite3.IntegrityError:
             return False
 
-    def update_user_password(self, username: str, password_hash: str):
+    def update_user_password(self, username: str, new_password_hash: str) -> bool:
         with sqlite3.connect(self.db_path) as conn:
-            conn.execute('''
-                UPDATE users SET password_hash = ? WHERE username = ?
-            ''', (password_hash, username))
+            cursor = conn.execute(
+                "UPDATE users SET password_hash = ? WHERE username = ?",
+                (new_password_hash, username)
+            )
             conn.commit()
+            return cursor.rowcount > 0
 
-    def get_user(self, username: str):
+    def get_user_hash(self, username: str) -> str:
         with sqlite3.connect(self.db_path) as conn:
-            conn.row_factory = sqlite3.Row
-            cursor = conn.execute("SELECT * FROM users WHERE username = ?", (username,))
-            return cursor.fetchone()
-
-    def user_exists(self, username: str) -> bool:
-        return self.get_user(username) is not None
-
+            cursor = conn.execute("SELECT password_hash FROM users WHERE username = ?", (username,))
+            row = cursor.fetchone()
+            return row[0] if row else None

{detecti_cli-2.0.1 → detecti_cli-2.0.3}/detecti/utils/setup.py

@@ -153,8 +153,8 @@ class SetupManager:
         if not nuclei_path:
             return {
                 "name": "Nuclei Vulnerability Scanner",
-                "status": "Optional / Not Installed",
-                "ok": True,  # Nuclei is optional but recommended
+                "status": "Not Installed",
+                "ok": False,
                 "installed": False,
                 "path": None,
                 "message": "Nuclei binary not found in PATH. Install to enable active vulnerability verification.",
@@ -245,7 +245,7 @@ class SetupManager:
         all_success = True
 
         # Step 0: Dashboard Admin Password Setup
-        self.console.print("🔐 [bold white]Step 0/8: Configuring DetecTIHound Dashboard Admin...[/bold white]")
+        self.console.print("🔐 [bold white]Step 0/6: Configuring DetecTIHound Dashboard Admin...[/bold white]")
         try:
             import getpass
             import sys
@@ -313,7 +313,7 @@ class SetupManager:
             traceback.print_exc()
 
         # Step 1: Create Directories & Copy Demo DB
-        self.console.print("📁 [bold white]Step 1/8: Initializing project directories...[/bold white]")
+        self.console.print("📁 [bold white]Step 1/6: Initializing project directories...[/bold white]")
         for d in [DETECTI_HOME / "data" / "dbs", Path.cwd() / "reports"]:
             d.mkdir(parents=True, exist_ok=True)
             
@@ -326,19 +326,17 @@ class SetupManager:
         self.console.print("  [green]✔ Operational directories verified (data/dbs, reports).[/green]")
 
         # Step 2: Configure .env
-        self.console.print("\n⚙️ [bold white]Step 2/8: Checking environment configuration (.env)...[/bold white]")
+        self.console.print("\n⚙️ [bold white]Step 2/6: Checking environment configuration (.env)...[/bold white]")
         env_file = DETECTI_HOME / ".env"
-        env_example = self.root_dir / ".env.example"
-        if not env_file.exists() and env_example.exists():
-            shutil.copy(env_example, env_file)
-            self.console.print(f"  [green]✔ Created .env file at {env_file} from template.[/green]")
-        elif env_file.exists():
+        if env_file.exists():
             self.console.print(f"  [green]✔ Existing .env file detected at {env_file} and preserved.[/green]")
         else:
-            self.console.print("  [yellow]⚠ No .env template found. Skipped.[/yellow]")
+            env_content = "# DetecTI-CLI Configuration\n# Add your API Keys here for enhanced intelligence\nSHODAN_API_KEY=\nCENSYS_API_ID=\nCENSYS_API_SECRET=\nGITHUB_TOKEN=\n"
+            env_file.write_text(env_content)
+            self.console.print(f"  [green]✔ Created default .env file at {env_file}.[/green]")
 
         # Step 3: Python dependencies check / install
-        self.console.print("\n🐍 [bold white]Step 3/8: Verifying Python dependencies...[/bold white]")
+        self.console.print("\n🐍 [bold white]Step 3/6: Verifying Python dependencies...[/bold white]")
         req_file = self.root_dir / "requirements.txt"
         dep_check = self.check_python_modules()
         if not dep_check["ok"] and req_file.exists():
@@ -353,7 +351,7 @@ class SetupManager:
             self.console.print("  [green]✔ All Python core dependencies are satisfied.[/green]")
 
         # Step 4: Masscan capabilities configuration
-        self.console.print("\n⚡ [bold white]Step 4/8: Configuring Masscan network capabilities...[/bold white]")
+        self.console.print("\n⚡ [bold white]Step 4/6: Configuring Masscan network capabilities...[/bold white]")
         masscan_bin = shutil.which("masscan")
         if masscan_bin:
             is_root = hasattr(os, "geteuid") and os.geteuid() == 0
@@ -379,7 +377,7 @@ class SetupManager:
             self.console.print("    [dim]Install on Linux with: sudo apt install -y masscan (or pacman/dnf)[/dim]")
 
         # Step 5: ExploitDB Cache Update
-        self.console.print("\n💣 [bold white]Step 5/8: Initializing ExploitDB vulnerability mapping...[/bold white]")
+        self.console.print("\n💣 [bold white]Step 5/6: Initializing ExploitDB vulnerability mapping...[/bold white]")
         try:
             from modules.exploitdb import ExploitDBModule
             ExploitDBModule.update_database()
@@ -388,7 +386,7 @@ class SetupManager:
             self.console.print(f"  [yellow]⚠ ExploitDB update notice: {exc}[/yellow]")
 
         # Step 6: Nuclei Templates Check
-        self.console.print("\n🛡️ [bold white]Step 6/8: Checking Nuclei vulnerability engine...[/bold white]")
+        self.console.print("\n🛡️ [bold white]Step 6/6: Checking Nuclei vulnerability engine...[/bold white]")
         nuclei_bin = shutil.which("nuclei")
         if nuclei_bin:
             try:
@@ -400,54 +398,6 @@ class SetupManager:
         else:
             self.console.print("  [dim]Nuclei is optional and not currently installed.[/dim]")
 
-        # Step 7: Configure Global Executable & Install Source
-        self.console.print("\n🌍 [bold white]Step 7/8: Installing Source & Configuring Global Executable...[/bold white]")
-        try:
-            is_root = hasattr(os, "geteuid") and os.geteuid() == 0
-            if is_root:
-                bin_dir = Path("/usr/local/bin")
-                install_dir = Path("/opt/detecti-cli")
-            else:
-                bin_dir = Path.home() / ".local" / "bin"
-                install_dir = DETECTI_HOME / "app"
-            
-            if self.root_dir.resolve() == install_dir.resolve():
-                self.console.print(f"  [cyan]Running from installed location ({install_dir}). Skipping source copy.[/cyan]")
-            else:
-                self.console.print(f"  [cyan]Copying source code to {install_dir}...[/cyan]")
-                
-                # Remove old install dir if exists to ensure clean install
-                if install_dir.exists():
-                    shutil.rmtree(install_dir)
-                    
-                # Copy source code, ignoring unnecessary/heavy folders
-                shutil.copytree(
-                    self.root_dir,
-                    install_dir,
-                    ignore=shutil.ignore_patterns('.git', '__pycache__', 'node_modules', 'reports', '.pytest_cache')
-                )
-            
-            bin_dir.mkdir(parents=True, exist_ok=True)
-            wrapper_path = bin_dir / "detecti-cli"
-            
-            # The actual python script is now in the install_dir
-            target_script = install_dir / "cli.py"
-            
-            wrapper_content = f"""#!/usr/bin/env bash
-# DetecTI-CLI Global Wrapper
-python3 "{target_script}" "$@"
-"""
-            wrapper_path.write_text(wrapper_content)
-            # Make it executable (chmod +x)
-            wrapper_path.chmod(wrapper_path.stat().st_mode | 0o111)
-            
-            self.console.print(f"  [green]✔ Source installed securely in {install_dir}[/green]")
-            self.console.print(f"  [green]✔ Global executable created at {wrapper_path}[/green]")
-            if not is_root:
-                self.console.print(f"  [cyan]ℹ Make sure {bin_dir} is in your PATH.[/cyan]")
-        except Exception as exc:
-            self.console.print(f"  [red]✘ Failed to install source or create global executable: {exc}[/red]")
-            all_success = False
 
         self.console.print("\n[bold green]✅ DetecTI-CLI setup routine completed![/bold green]\n")
         return all_success

{detecti_cli-2.0.1 → detecti_cli-2.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "detecti-cli"
-version = "2.0.1"
+version = "2.0.3"
 description = "Modern Attack Surface Management & Threat Intelligence Engine"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -52,7 +52,7 @@ dependencies = [
     "fastapi>=0.104.0",
     "uvicorn[standard]>=0.24.0",
     "psutil>=5.9.0",
-    "passlib[bcrypt]>=1.7.4",
+    "bcrypt>=4.0.0",
     "python-jose[cryptography]>=3.3.0",
     "python-multipart>=0.0.6",
 ]

detecti_cli-2.0.1/install.py

@@ -1,104 +0,0 @@
-#!/usr/bin/env python3
-"""
-DetecTI-CLI - Automated Installer & Bootstrapper
-This script installs the necessary dependencies and delegates the
-system configuration to the SetupManager.
-"""
-import os
-import sys
-import subprocess
-from pathlib import Path
-
-def print_step(msg: str) -> None:
-    print(f"\n\033[1;34m[+]\033[0m \033[1;37m{msg}\033[0m")
-
-def print_success(msg: str) -> None:
-    print(f"\033[1;32m[✔]\033[0m {msg}")
-
-def print_error(msg: str) -> None:
-    print(f"\033[1;31m[✘]\033[0m \033[1;31m{msg}\033[0m")
-
-def print_banner() -> None:
-    banner = """
- ██████╗ ███████╗████████╗███████╗ ██████╗████████╗██╗       ██████╗██╗     ██╗
- ██╔══██╗██╔════╝╚══██╔══╝██╔════╝██╔════╝╚══██╔══╝██║      ██╔════╝██║     ██║
- ██║  ██║█████╗     ██║   █████╗  ██║        ██║   ██║█████╗██║     ██║     ██║
- ██║  ██║██╔══╝     ██║   ██╔══╝  ██║        ██║   ██║╚════╝██║     ██║     ██║
- ██████╔╝███████╗   ██║   ███████╗╚██████╗   ██║   ██║      ╚██████╗███████╗██║
- ╚═════╝ ╚══════╝   ╚═╝   ╚══════╝ ╚═════╝   ╚═╝   ╚═╝       ╚═════╝╚══════╝╚═╝
-                                                                                
- DetecTI - Cyber Lead Intelligence Installer
- Powered by DetecTI Security - https://detecti.com.br
-"""
-    print(f"\033[1;36m{banner}\033[0m")
-
-def install_dependencies() -> None:
-    root_dir = Path(__file__).resolve().parent
-    req_file = root_dir / "requirements.txt"
-    if req_file.exists():
-        print_step("Bootstrapping Python dependencies...")
-        try:
-            # First attempt standard installation
-            result = subprocess.run(
-                [sys.executable, "-m", "pip", "install", "-r", str(req_file)],
-                stdout=subprocess.DEVNULL,
-                stderr=subprocess.PIPE,
-                text=True
-            )
-            
-            if result.returncode != 0:
-                if "externally-managed-environment" in result.stderr:
-                    # PEP 668 bypass for Debian/Kali/Ubuntu modern versions
-                    subprocess.check_call(
-                        [sys.executable, "-m", "pip", "install", "--break-system-packages", "-r", str(req_file)],
-                        stdout=subprocess.DEVNULL,
-                        stderr=subprocess.STDOUT
-                    )
-                else:
-                    print_error("Failed to install dependencies.")
-                    print(result.stderr)
-                    sys.exit(1)
-                    
-            print_success("Core dependencies installed successfully.")
-        except subprocess.CalledProcessError as e:
-            print_error("Failed to install dependencies.")
-            print_error("Try running: pip3 install -r requirements.txt manually.")
-            sys.exit(1)
-    else:
-        print_error(f"requirements.txt not found at {req_file}")
-        sys.exit(1)
-
-def run_setup() -> None:
-    print_step("Initializing DetecTI-CLI Setup Routine...")
-    # Now that dependencies are guaranteed, we can safely import them
-    try:
-        from rich.console import Console
-        from utils.setup import SetupManager
-        
-        console = Console()
-        setup_mgr = SetupManager(console=console)
-        
-        success = setup_mgr.run_automated_setup()
-        
-        print("\n")
-        console.rule("[bold cyan]Verification Diagnostics[/bold cyan]")
-        checks = setup_mgr.check_all()
-        setup_mgr.render_diagnostics_table(checks)
-        
-        if not success:
-            console.print("\n[yellow]⚠ Setup completed, but some components reported errors. Please review the logs above.[/yellow]")
-            
-    except ImportError as e:
-        print_error(f"Failed to load setup module. Error: {e}")
-        sys.exit(1)
-
-if __name__ == "__main__":
-    print_banner()
-    
-    # Enforce running from the repository root
-    if not (Path(__file__).resolve().parent / "utils" / "setup.py").exists():
-        print_error("Installer must be run from the root of the DetecTI-CLI repository.")
-        sys.exit(1)
-        
-    install_dependencies()
-    run_setup()