Improve logging (#101)

Author: torbsto

fastapi_jwks/validators/jwks_validator.py

@@ -1,3 +1,4 @@
+import logging
 from functools import cached_property
 from typing import Any, Generic, TypeVar
 
@@ -6,11 +7,12 @@
 from cachetools import TTLCache, cached
 from fastapi import HTTPException
 from jwt import algorithms
-from loguru import logger
 from pydantic import BaseModel
 
 from fastapi_jwks.models.types import JWKSConfig, JWTDecodeConfig
 
+logger = logging.getLogger("fastapi-jwks")
+
 DataT = TypeVar("DataT", bound=BaseModel)
 
 
@@ -41,10 +43,7 @@ def jwks_data(self) -> dict[str, Any]:
 
     @staticmethod
     def __extract_algorithms(jwks_response: dict[str, Any]) -> list[str]:
-        if "keys" not in jwks_response:
-            raise ValueError("JWKS response does not contain keys")
-        keys = jwks_response["keys"]
-        return [key["alg"] for key in keys]
+        return [key["alg"] for key in jwks_response["keys"]]
 
     @cached_property
     def __is_generic_passed(self):
@@ -63,7 +62,11 @@ def validate_token(self, token: str) -> DataT:
             header = jwt.get_unverified_header(token)
             kid = header["kid"]
             jwks_data = self.jwks_data()
-            if header["alg"] not in self.__extract_algorithms(jwks_data):
+            provided_algorithms = self.__extract_algorithms(jwks_data)
+            if header["alg"] not in provided_algorithms:
+                logger.debug(
+                    f"Could not find '{header['alg']}' in provided algorithms: {provided_algorithms}"
+                )
                 raise HTTPException(status_code=401, detail="Invalid token")
             for key in jwks_data["keys"]:
                 if key["kid"] == kid:
@@ -72,6 +75,9 @@ def validate_token(self, token: str) -> DataT:
                     ].from_jwk(key)
                     break
             if public_key is None:
+                logger.debug(
+                    f"No public key for provided algorithm '{header['alg']}' found in JWKS data"
+                )
                 raise HTTPException(status_code=401, detail="Invalid token")
             return self.__orig_class__.__args__[0].model_validate(  # type: ignore
                 # This line gets the generic value in runtime to transform it to the correct pydantic model
@@ -83,6 +89,8 @@ def validate_token(self, token: str) -> DataT:
                 )
             )
         except jwt.ExpiredSignatureError:
+            logger.debug("Expired token", exc_info=True)
             raise HTTPException(status_code=401, detail="Token has expired") from None
         except jwt.InvalidTokenError:
+            logger.debug("Invalid token", exc_info=True)
             raise HTTPException(status_code=401, detail="Invalid token") from None