replaces python-jose with pyjwt using cryptography as a backend

Makefile

@@ -98,8 +98,7 @@ bandit:
 .PHONY: pip-audit
 pip-audit:
 	pip-audit --version
-	# TODO: Fix the issue with the vulnerable ecdsa and jose libraries
-	pip-audit -r requirements.txt --ignore-vuln GHSA-wj6h-64fc-37mp --ignore-vuln GHSA-cjwg-qfpm-7377 --ignore-vuln GHSA-6c5p-j8vq-pqhj
+	pip-audit -r requirements.txt
 
 .PHONY: secure
 secure: bandit pip-audit

lbz/authz/authorizer.py

@@ -1,9 +1,7 @@
 from __future__ import annotations
 
-from jose import jwt
-
 from lbz.exceptions import PermissionDenied
-from lbz.jwt_utils import decode_jwt
+from lbz.jwt_utils import decode_jwt, encode_jwt
 from lbz.misc import deep_update, get_logger
 
 logger = get_logger(__name__)
@@ -131,12 +129,4 @@ def restrictions(self) -> dict:
     @staticmethod
     def sign_authz(authz_data: dict, private_key_jwk: dict) -> str:
         """Signs authorization in JWT format."""
-        if not isinstance(private_key_jwk, dict):
-            raise ValueError("private_key_jwk must be a jwk dict")
-        if "kid" not in private_key_jwk:
-            raise ValueError("private_key_jwk must have the 'kid' field")
-
-        authz: str = jwt.encode(
-            authz_data, private_key_jwk, algorithm="RS256", headers={"kid": private_key_jwk["kid"]}
-        )
-        return authz
+        return encode_jwt(authz_data, private_key_jwk)

lbz/jwt_utils.py

@@ -1,5 +1,6 @@
-from jose import jwt
-from jose.exceptions import ExpiredSignatureError, JWTClaimsError, JWTError
+import jwt
+from jwt import PyJWK
+from jwt.exceptions import ExpiredSignatureError, InvalidAudienceError, InvalidTokenError
 
 from lbz._cfg import ALLOWED_AUDIENCES, ALLOWED_ISS, ALLOWED_PUBLIC_KEYS
 from lbz.exceptions import MissingConfigValue, SecurityError, Unauthorized
@@ -8,19 +9,20 @@
 logger = get_logger(__name__)
 
 
-def get_matching_jwk(auth_jwt_token: str) -> dict:
+def get_matching_jwk(token: str) -> dict:
     """Checks provided JWT token against allowed tokens."""
     try:
-        kid_from_jwt_header = jwt.get_unverified_header(auth_jwt_token)["kid"]
+        kid_from_jwt_header = jwt.get_unverified_header(token)["kid"]
         for key in ALLOWED_PUBLIC_KEYS.value:
             if key["kid"] == kid_from_jwt_header:
                 return key
 
         logger.warning(
-            "The key with id=%s was not found in the environment variable.", kid_from_jwt_header
+            "The key with id=%s was not found in the environment variable.",
+            kid_from_jwt_header,
         )
         raise Unauthorized
-    except JWTError as error:
+    except InvalidTokenError as error:
         logger.warning("Error finding matching JWK %r", error)
         raise Unauthorized from error
     except KeyError as error:
@@ -38,7 +40,7 @@ def validate_jwt_properties(decoded_jwt: dict) -> None:
         raise Unauthorized(f"{issuer} is not an allowed token issuer")
 
 
-def decode_jwt(auth_jwt_token: str) -> dict:  # noqa:C901
+def decode_jwt(token: str) -> dict:  # noqa:C901
     """Decodes JWT token."""
 
     if not ALLOWED_PUBLIC_KEYS.value:
@@ -50,23 +52,44 @@ def decode_jwt(auth_jwt_token: str) -> dict:  # noqa:C901
     if any("kid" not in public_key for public_key in ALLOWED_PUBLIC_KEYS.value):
         raise RuntimeError("One of the provided public keys doesn't have the 'kid' field")
 
-    jwk = get_matching_jwk(auth_jwt_token)
+    jwk = get_matching_jwk(token)
     for idx, aud in enumerate(ALLOWED_AUDIENCES.value, start=1):
         try:
-            decoded_jwt: dict = jwt.decode(auth_jwt_token, jwk, algorithms="RS256", audience=aud)
+            decoded_jwt: dict = jwt.decode(
+                jwt=token,
+                key=PyJWK(jwk, algorithm="RS256").key,
+                algorithms=["RS256"],
+                audience=aud,
+            )
             validate_jwt_properties(decoded_jwt)
             return decoded_jwt
-        except JWTClaimsError as error:
+        except InvalidAudienceError as error:
             if idx == len(ALLOWED_AUDIENCES.value):
                 logger.warning("Failed decoding JWT with any of JWK - details: %r", error)
                 raise Unauthorized() from error
         except ExpiredSignatureError as error:
             raise Unauthorized("Your token has expired. Please refresh it.") from error
-        except JWTError as error:
+        except InvalidTokenError as error:
             logger.warning("Failed decoding JWT with following details: %r", error)
             raise Unauthorized() from error
         except Exception as ex:
-            msg = f"An error occurred during decoding the token.\nToken body:\n{auth_jwt_token}"
+            msg = f"An error occurred during decoding the token.\nToken body:\n{token}"
             raise RuntimeError(msg) from ex
     logger.error("Failed decoding JWT for unknown reason.")
     raise Unauthorized
+
+
+def encode_jwt(data: dict, private_key_jwk: dict) -> str:
+    """Signs authorization in JWT format."""
+    if not isinstance(private_key_jwk, dict):
+        raise ValueError("private_key_jwk must be a jwk dict")
+    if "kid" not in private_key_jwk:
+        raise ValueError("private_key_jwk must have the 'kid' field")
+
+    encoded_data: str = jwt.encode(
+        payload=data,
+        key=PyJWK(private_key_jwk, algorithm="RS256").key,
+        algorithm="RS256",
+        headers={"kid": private_key_jwk["kid"]},
+    )
+    return encoded_data

requirements-dev.txt

@@ -4,17 +4,17 @@
 #
 #    pip-compile requirements-dev.in
 #
-astroid==3.3.5
+astroid==3.3.6
     # via pylint
-bandit==1.7.10
+bandit==1.8.0
     # via -r requirements-dev.in
 black==24.10.0
     # via -r requirements-dev.in
 boolean-py==4.0
     # via license-expression
-boto3-stubs[cognito-idp,dynamodb,events,lambda,s3,sns,sqs,ssm]==1.34.158
+boto3-stubs[cognito-idp,dynamodb,events,lambda,s3,sns,sqs,ssm]==1.35.78
     # via -r requirements-dev.in
-botocore-stubs==1.34.158
+botocore-stubs==1.35.78
     # via boto3-stubs
 build==1.2.2.post1
     # via pip-tools
@@ -30,7 +30,7 @@ click==8.1.7
     # via
     #   black
     #   pip-tools
-coverage[toml]==7.6.5
+coverage[toml]==7.6.9
     # via
     #   -r requirements-dev.in
     #   pytest-cov
@@ -72,21 +72,21 @@ msgpack==1.1.0
     # via cachecontrol
 mypy==1.13.0
     # via -r requirements-dev.in
-mypy-boto3-cognito-idp==1.34.158
+mypy-boto3-cognito-idp==1.35.77
     # via boto3-stubs
-mypy-boto3-dynamodb==1.34.148
+mypy-boto3-dynamodb==1.35.74
     # via boto3-stubs
-mypy-boto3-events==1.34.151
+mypy-boto3-events==1.35.72
     # via boto3-stubs
-mypy-boto3-lambda==1.34.77
+mypy-boto3-lambda==1.35.68
     # via boto3-stubs
-mypy-boto3-s3==1.34.162
+mypy-boto3-s3==1.35.76.post1
     # via boto3-stubs
-mypy-boto3-sns==1.34.121
+mypy-boto3-sns==1.35.68
     # via boto3-stubs
-mypy-boto3-sqs==1.34.121
+mypy-boto3-sqs==1.35.0
     # via boto3-stubs
-mypy-boto3-ssm==1.34.158
+mypy-boto3-ssm==1.35.67
     # via boto3-stubs
 mypy-extensions==1.0.0
     # via
@@ -127,15 +127,15 @@ pyflakes==3.2.0
     # via flake8
 pygments==2.18.0
     # via rich
-pylint==3.3.1
+pylint==3.3.2
     # via -r requirements-dev.in
 pyparsing==3.2.0
     # via pip-requirements-parser
 pyproject-hooks==1.2.0
     # via
     #   build
     #   pip-tools
-pytest==8.3.3
+pytest==8.3.4
     # via
     #   -r requirements-dev.in
     #   pytest-cov
@@ -154,17 +154,17 @@ rich==13.9.4
     # via
     #   bandit
     #   pip-audit
-six==1.16.0
+six==1.17.0
     # via
-    #   -c requirements.txt
+    #   -c /Users/dybapi/PycharmProjects/lambdalizator/requirements.txt
     #   html5lib
 sortedcontainers==2.4.0
     # via cyclonedx-python-lib
-stevedore==5.3.0
+stevedore==5.4.0
     # via bandit
 toml==0.10.2
     # via pip-audit
-tomli==2.1.0
+tomli==2.2.1
     # via
     #   black
     #   build
@@ -175,13 +175,13 @@ tomli==2.1.0
     #   pytest
 tomlkit==0.13.2
     # via pylint
-types-awscrt==0.23.0
+types-awscrt==0.23.4
     # via botocore-stubs
-types-s3transfer==0.10.3
+types-s3transfer==0.10.4
     # via boto3-stubs
 typing-extensions==4.12.2
     # via
-    #   -c requirements.txt
+    #   -c /Users/dybapi/PycharmProjects/lambdalizator/requirements.txt
     #   astroid
     #   black
     #   boto3-stubs
@@ -198,11 +198,11 @@ typing-extensions==4.12.2
     #   rich
 urllib3==1.26.20
     # via
-    #   -c requirements.txt
+    #   -c /Users/dybapi/PycharmProjects/lambdalizator/requirements.txt
     #   requests
 webencodings==0.5.1
     # via html5lib
-wheel==0.45.0
+wheel==0.45.1
     # via pip-tools
 zipp==3.21.0
     # via importlib-metadata

requirements.txt

@@ -4,36 +4,32 @@
 #
 #    pip-compile
 #
-boto3==1.34.162
+boto3==1.35.78
     # via lbz (setup.py)
-botocore==1.34.162
+botocore==1.35.78
     # via
     #   boto3
     #   s3transfer
-ecdsa==0.19.0
-    # via python-jose
+cffi==1.17.1
+    # via cryptography
+cryptography==43.0.3
+    # via lbz (setup.py)
 jmespath==1.0.1
     # via
     #   boto3
     #   botocore
 multidict==6.1.0
     # via lbz (setup.py)
-pyasn1==0.6.1
-    # via
-    #   python-jose
-    #   rsa
+pycparser==2.22
+    # via cffi
+pyjwt==2.9.0
+    # via lbz (setup.py)
 python-dateutil==2.9.0.post0
     # via botocore
-python-jose==3.3.0
-    # via lbz (setup.py)
-rsa==4.9
-    # via python-jose
-s3transfer==0.10.3
+s3transfer==0.10.4
     # via boto3
-six==1.16.0
-    # via
-    #   ecdsa
-    #   python-dateutil
+six==1.17.0
+    # via python-dateutil
 typing-extensions==4.12.2
     # via multidict
 urllib3==1.26.20

setup.py

@@ -16,9 +16,10 @@
     long_description_content_type="text/markdown",
     long_description=pathlib.Path("README.md").read_text("utf-8"),
     install_requires=[
-        "boto3>=1.34.11,<1.35.0",
+        "boto3>=1.35.0,<1.36.0",
+        "cryptography>=43.0.3,<43.1.0",
         "multidict>=6.1.0,<6.2.0",
-        "python-jose>=3.3.0,<3.4.0",
+        "PyJWT>=2.9.0,<2.10.0",
     ],
     classifiers=[
         "Development Status :: 5 - Production/Stable",

tests/conftest.py

@@ -21,15 +21,14 @@
     LOGGING_LEVEL,
 )
 from lbz.authentication import User
-from lbz.authz.authorizer import Authorizer
 from lbz.authz.decorators import authorization
 from lbz.collector import authz_collector
+from lbz.jwt_utils import encode_jwt
 from lbz.resource import Resource
 from lbz.response import Response
 from lbz.rest import APIGatewayEvent, ContentType, HTTPRequest
 from lbz.router import Router, add_route
 from tests.fixtures.rsa_pair import SAMPLE_PRIVATE_KEY, SAMPLE_PUBLIC_KEY
-from tests.utils import encode_token
 
 
 @pytest.fixture(scope="session", name="allowed_audiences")
@@ -125,7 +124,7 @@ def full_access_authz_payload_fixture(jwt_partial_payload: dict) -> dict:
 def full_access_auth_header(
     full_access_authz_payload: dict,
 ) -> str:
-    return Authorizer.sign_authz(
+    return encode_jwt(
         full_access_authz_payload,
         SAMPLE_PRIVATE_KEY,
     )
@@ -135,7 +134,7 @@ def full_access_auth_header(
 def limited_access_auth_header(
     full_access_authz_payload: dict,
 ) -> str:
-    return Authorizer.sign_authz(
+    return encode_jwt(
         {
             **full_access_authz_payload,
             "allow": {"test_res": {"perm-name": {"allow": "*"}}},
@@ -167,7 +166,7 @@ def user_cognito_fixture(username: str, jwt_partial_payload: dict) -> dict:
 
 @pytest.fixture(scope="session", name="user_token")
 def user_token_fixture(user_cognito: dict) -> str:
-    return encode_token(user_cognito)
+    return encode_jwt(user_cognito, SAMPLE_PRIVATE_KEY)
 
 
 @pytest.fixture(name="user")  # scope="session", - TODO: bring that back to reduce run time