chore(auth):fix the bcrypt library error of 72 bytes

Author: wailbentafat

app/core/logger.py

@@ -0,0 +1,15 @@
+import logging
+
+
+DEFAULT_LOG_FORMAT = "%(asctime)s | %(levelname)s | %(name)s | %(message)s"
+
+
+logger = logging.getLogger("multAI")
+
+
+def configure_logger(level: int = logging.INFO) -> None:
+    logging.basicConfig(
+        level=level,
+        format=DEFAULT_LOG_FORMAT,
+        force=True,
+    )

app/core/securite.py

@@ -5,40 +5,48 @@
 import pyotp
 from app.core.config import settings
 from app.core.exceptions import AppException
+from app.core.logger import logger
+
 
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 _BCRYPT_MAX_LEN = 72
 
 
-def _normalize_password(password: str) -> str:
-    return password[:_BCRYPT_MAX_LEN]
+def _normalize_password(password: str) -> bytes:
+    return password.encode("utf-8")[:_BCRYPT_MAX_LEN]
 
 
 def hash_password(password: str) -> str:
     normalized = _normalize_password(password)
+    logger.debug("hashing password (normalized %s bytes)", len(normalized))
     return pwd_context.hash(normalized)
 
 
 def verify_password(password: str, hashed: str) -> bool:
     normalized = _normalize_password(password)
-    return pwd_context.verify(normalized, hashed)
+    result = pwd_context.verify(normalized, hashed)
+    logger.debug("password verification result: %s", result)
+    return result
 
-def Get_expiry_time()->int :
-    if settings.environment == "dev":
-        expirty = 60 * 60 * 24 * 7
-    else :
-        expirty = 60 * 60 * 24
-    return expirty
 
+def Get_expiry_time() -> int:
+    if settings.environment == "dev":
+        expiry = 60 * 60 * 24 * 7
+    else:
+        expiry = 60 * 60 * 24
+    return expiry
 
 
-def create_acces_mobile_token(session_id:str) -> str:
-    payload :dict [str,Any]= {
+def create_acces_mobile_token(session_id: str) -> str:
+    payload: dict[str, Any] = {
         "session_id": session_id,
-        "exp": int((datetime.now(timezone.utc) + timedelta(seconds=Get_expiry_time())).timestamp())
+        "exp": int(
+            (datetime.now(timezone.utc) + timedelta(seconds=Get_expiry_time())).timestamp()
+        ),
     }
     return jwt.encode(payload, key=settings.jwt_secret, algorithm=settings.jwt_algorithm)
 
+
 def decode_access_mobile_token(token: str) -> dict[str, Any]:
     try:
         payload = jwt.decode(token, key=settings.jwt_secret, algorithms=[settings.jwt_algorithm])
@@ -48,13 +56,17 @@ def decode_access_mobile_token(token: str) -> dict[str, Any]:
     except jwt.InvalidTokenError:
         raise AppException.unauthorized("Invalid token")
 
-def create_refresh_mobile_token(session_id:str) -> str:
-    payload :dict [str,Any]= {
+
+def create_refresh_mobile_token(session_id: str) -> str:
+    payload: dict[str, Any] = {
         "session_id": session_id,
-        "exp": int((datetime.now(timezone.utc) + timedelta(seconds=Get_expiry_time()*4)).timestamp())
+        "exp": int(
+            (datetime.now(timezone.utc) + timedelta(seconds=Get_expiry_time() * 4)).timestamp()
+        ),
     }
     return jwt.encode(payload, key=settings.jwt_secret, algorithm=settings.jwt_algorithm)
 
+
 def decode_refresh_mobile_token(token: str) -> dict[str, Any]:
     try:
         payload = jwt.decode(token, key=settings.jwt_secret, algorithms=[settings.jwt_algorithm])
@@ -69,19 +81,22 @@ def create_totp_secret() -> str:
     return pyotp.random_base32()
 
 
-
 def get_totp_uri(secret: str, email: str) -> str:
     totp = pyotp.TOTP(secret)
     return totp.provisioning_uri(name=email, issuer_name=settings.totp_issuer)
 
+
 def verify_totp_token_with_window(secret: str, token: str, valid_window: int = 8) -> bool:
     totp = pyotp.TOTP(secret)
     return totp.verify(token, valid_window=valid_window)
 
-def generate_Acces_token_stuff(user_id:str ,role:str) -> str:
-    payload :dict [str,Any]= {
+
+def generate_Acces_token_stuff(user_id: str, role: str) -> str:
+    payload: dict[str, Any] = {
         "user_id": user_id,
         "role": role,
-        "exp": int((datetime.now(timezone.utc) + timedelta(seconds=Get_expiry_time())).timestamp())
+        "exp": int(
+            (datetime.now(timezone.utc) + timedelta(seconds=Get_expiry_time())).timestamp()
+        ),
     }
     return jwt.encode(payload, key=settings.jwt_secret, algorithm=settings.jwt_algorithm)

app/infra/nats.py

@@ -30,7 +30,7 @@ async def connect() -> None:
                 password=settings.NATS_PASSWORD,
             )
             NatsClient._nc = nc
-            NatsClient._js = nc.jetstream()
+            NatsClient._js = nc.jetstream() # type: ignore
 
     @staticmethod
     async def close() -> None:
@@ -58,7 +58,7 @@ async def subscribe(subject: NatsSubjects, callback: Callable[[Any], Any]) -> No
         async def _wrapper(msg: Msg) -> None:
             await callback(msg.data)
 
-        await nc.subscribe(subject.value, cb=_wrapper)
+        await nc.subscribe(subject.value, cb=_wrapper) # type: ignore
 
 
     @staticmethod

app/infra/redis.py

@@ -15,7 +15,7 @@ def __new__(cls, *args: Any, **kwargs: Any) -> "RedisClient":
 
     def __init__(self, host: str, port: int, password: str) -> None:
         if not hasattr(self, "client"):
-            self.client = Redis.from_url(
+            self.client = Redis.from_url( # type: ignore
                 f"redis://{host}:{port}", password=password, decode_responses=True
             )
 

app/main.py

@@ -1,4 +1,3 @@
-import logging
 import time
 from contextlib import asynccontextmanager
 import asyncio
@@ -13,16 +12,9 @@
 from app.infra.redis import RedisClient
 from app.router.mobile.auth import router as mobile_auth_router
 from app.router.staff.drive import router as staff_drive_router
+from app.core.logger import configure_logger, logger
 
-
-
-logging.basicConfig(
-    level=logging.INFO,
-    format="%(asctime)s | %(levelname)s | %(name)s | %(message)s",
-)
-
-logger = logging.getLogger("api")
-
+configure_logger()
 
 
 class RequestLoggingMiddleware(BaseHTTPMiddleware):

app/service/users.py

@@ -19,6 +19,7 @@
 from db.generated import devices as device_queries
 from db.generated import session as session_queries
 from db.generated.models import User
+from app.core.logger import logger
 
 
 class AuthService:
@@ -43,15 +44,18 @@ async def mobile_register_login(
         redis: RedisClient,
         req: MobileAuthRequest,
     ) -> MobileAuthResponse:
+        logger.info("mobile register/login attempt for %s", req.email)
         existing_user = await self.user_querier.get_user_by_email(email=req.email)
         user: User | None = None
 
         if existing_user is not None:
             if not verify_password(req.password, existing_user.hashed_password or ""):
                 raise AppException.unauthorized("Invalid credentials")
             user = existing_user
+            logger.info("existing user login: %s", req.email)
         else:
             hashed = hash_password(req.password)
+            logger.info("creating new user for %s", req.email)
             user = await self.user_querier.create_user(
                 email=req.email, hashed_password=hashed
             )
@@ -68,6 +72,11 @@ async def mobile_register_login(
 
         session_count = await self.session_querier.count_user_sessions(user_id=user_id)
         if session_count and session_count >= AuthService.SESSION_LIMIT:
+            logger.warning(
+                "user %s reached session limit %s",
+                req.email,
+                AuthService.SESSION_LIMIT,
+            )
             raise AppException.forbidden("Maximum session limit reached")
 
         device_id = uuid.UUID(req.device_id)
@@ -99,6 +108,7 @@ async def mobile_register_login(
         access_token = create_acces_mobile_token(str(session.id))
         refresh_token = create_refresh_mobile_token(str(session.id))
         expiry = Get_expiry_time()
+        logger.info("created session %s for user %s", session.id, user_id)
 
         return MobileAuthResponse(
             access_token=access_token,

pyproject.toml

@@ -13,6 +13,7 @@ dependencies = [
     "miniopy-async>=1.23.4",
     "nats-py>=2.14.0",
     "passlib[bcrypt]>=1.7.4",
+    "bcrypt==4.3.0",
     "psycopg>=3.3.3",
     "pydantic>=2.12.5",
     "pydantic-settings>=2.13.1",