detecti-cli 2.0.2__tar.gz → 2.0.4__tar.gz

{detecti_cli-2.0.2 → detecti_cli-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: detecti-cli
-Version: 2.0.2
+Version: 2.0.4
 Summary: Modern Attack Surface Management & Threat Intelligence Engine
 Author-email: "Lucas S. (Ls4ss)" <lucas@lucassouza.io>
 License: MIT
@@ -17,13 +17,14 @@ 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
+Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: python-jose[cryptography]>=3.3.0
 Requires-Dist: python-multipart>=0.0.6
 Requires-Dist: requests>=2.31.0

{detecti_cli-2.0.2 → detecti_cli-2.0.4}/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.2 → detecti_cli-2.0.4}/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.2 → detecti_cli-2.0.4}/detecti/web/api/auth.py

@@ -10,7 +10,8 @@ from jose import JWTError, jwt
 from detecti.core.database.config_db import ConfigDBManager, verify_password
 
 from dotenv import load_dotenv
-load_dotenv()
+from detecti.config import DETECTI_HOME
+load_dotenv(DETECTI_HOME / ".env")
 
 # Secret key for JWT
 SECRET_KEY = os.environ.get("JWT_SECRET_KEY")

{detecti_cli-2.0.2 → detecti_cli-2.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "detecti-cli"
-version = "2.0.2"
+version = "2.0.4"
 description = "Modern Attack Surface Management & Threat Intelligence Engine"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -43,6 +43,7 @@ dependencies = [
     "httpx>=0.27.0",
     "pydantic>=2.7.0",
     "pydantic-settings>=2.2.0",
+    "python-dotenv>=1.0.0",
     "typer>=0.12.0",
     "rich>=13.7.0",
     "shodan>=1.31.0",
@@ -52,7 +53,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",
 ]