pypomes-jwt 1.0.5__tar.gz → 1.0.7__tar.gz

{pypomes_jwt-1.0.5 → pypomes_jwt-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_jwt
-Version: 1.0.5
+Version: 1.0.7
 Summary: A collection of Python pomes, penyeach (JWT module)
 Project-URL: Homepage, https://github.com/TheWiseCoder/PyPomes-JWT
 Project-URL: Bug Tracker, https://github.com/TheWiseCoder/PyPomes-JWT/issues

{pypomes_jwt-1.0.5 → pypomes_jwt-1.0.7}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pypomes_jwt"
-version = "1.0.5"
+version = "1.0.7"
 authors = [
   { name="GT Nunes", email="wisecoder01@gmail.com" }
 ]

{pypomes_jwt-1.0.5 → pypomes_jwt-1.0.7}/src/pypomes_jwt/jwt_pomes.py

@@ -52,16 +52,14 @@ def jwt_verify_request(request: Request) -> Response:
     auth_header: str = request.headers.get("Authorization")
 
     # was a 'Bearer' authorization obtained ?
-    bad_token: bool = False
+    bad_token: bool = True
     if auth_header and auth_header.startswith("Bearer "):
         # yes, extract and validate the JWT access token
         token: str = auth_header.split(" ")[1]
-        errors: list[str] = []
-        jwt_validate_token(errors=errors,
-                           nature="A",
-                           token=token)
-        if errors:
-            bad_token = True
+        if jwt_validate_token(errors=None,
+                              nature="A",
+                              token=token):
+            bad_token = False
 
     # deny the authorization
     if bad_token:
@@ -178,11 +176,13 @@ def jwt_validate_token(errors: list[str] | None,
 
         # retrieve token data from database
         if nature and not (token_kid and token_kid[0:1] == nature):
+            if logger:
+                logger.error(f"Nature of token's 'kid' ('{token_kid}') not '{nature}'")
             op_errors.append("Invalid token")
         elif token_kid and len(token_kid) > 1 and \
                 token_kid[0:1] in ["A", "R"] and token_kid[1:].isdigit():
             # token was likely issued locally
-            where_data: dict[str, Any] = {JWT_DB_COL_KID: int(token_kid[1:])}
+            where_data: dict[str, Any] = {JWT_DB_COL_KID: token_kid}
             if account_id:
                 where_data[JWT_DB_COL_ACCOUNT] = account_id
             recs: list[tuple[str]] = db_select(errors=op_errors,
@@ -226,7 +226,9 @@ def jwt_validate_token(errors: list[str] | None,
                                                      require=["iat", "iss", "exp", "sub"],
                                                      algorithms=token_alg)
                 if account_id and payload.get("sub") != account_id:
-                    op_errors.append("Token does not belong to account")
+                    if logger:
+                        logger.error(msg=f"Token does not belong to account '{account_id}'")
+                    op_errors.append("Invalid token")
                 else:
                     result = {
                         "header": token_header,
@@ -480,7 +482,7 @@ def jwt_refresh_tokens(errors: list[str] | None,
                             logger.error(msg=f"Error refreshing the token pair: {exc_err}")
                         op_errors.append(exc_err)
 
-                # conclude the transaction
+                # wrap-up the transaction
                 if op_errors:
                     db_rollback(errors=op_errors,
                                 connection=db_conn,

{pypomes_jwt-1.0.5 → pypomes_jwt-1.0.7}/src/pypomes_jwt/jwt_registry.py

@@ -308,7 +308,7 @@ class JwtRegistry:
                           committable=False,
                           logger=logger)
 
-                # conclude the transaction
+                # wrap-up the transaction
                 if not db_conn:
                     if errors:
                         db_rollback(errors=errors,
@@ -362,7 +362,7 @@ def _jwt_persist_token(account_id: str,
                        db_conn: Any,
                        logger: Logger = None) -> int:
     """
-    Persist the given token, making sure that the account limit is adhered to.
+    Persist the given token, making sure that the account limit is complied with.
 
     The tokens in storage, associated with *account_id*, are examined for their expiration timestamp.
     If a token's expiration timestamp is in the past, it is removed from storage. If the maximum number
@@ -464,12 +464,12 @@ def _jwt_persist_token(account_id: str,
     if errors:
         raise RuntimeError("; ".join(errors))
 
-    # obtain the token's storage id
-    # HAZARD: JWT_DB_COL_TOKEN's type might prevent it for being used in a WHERE clause
+    # obtain and return the token's storage id
+    # HAZARD: JWT_DB_COL_TOKEN's column type might prevent it for being used in a WHERE clause
     where_clause: str | None = None
     if existing_ids:
-        where_clause = f"{JWT_DB_COL_KID} NOT IN ({existing_ids})"
-        where_clause = where_clause.replace("[", "").replace("]", "")
+        where_clause = f"{JWT_DB_COL_KID} NOT IN {existing_ids}"
+        where_clause = where_clause.replace("[", "(", 1).replace("]", ")", 1)
     reply: list[tuple[int]] = db_select(errors=errors,
                                         sel_stmt=f"SELECT {JWT_DB_COL_KID} "
                                                  f"FROM {JWT_DB_TABLE}",