pypomes-jwt 0.5.9__tar.gz → 0.6.0__tar.gz

{pypomes_jwt-0.5.9 → pypomes_jwt-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_jwt
-Version: 0.5.9
+Version: 0.6.0
 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
@@ -10,6 +10,6 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.12
+Requires-Dist: cryptography>=44.0.0
 Requires-Dist: pyjwt>=2.10.1
-Requires-Dist: pyopenssl>=25.0.0
 Requires-Dist: pypomes-core>=1.7.1

{pypomes_jwt-0.5.9 → pypomes_jwt-0.6.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pypomes_jwt"
-version = "0.5.9"
+version = "0.6.0"
 authors = [
   { name="GT Nunes", email="wisecoder01@gmail.com" }
 ]
@@ -20,7 +20,7 @@ classifiers = [
 ]
 dependencies = [
     "PyJWT>=2.10.1",
-    "PyOpenSSL>=25.0.0",
+    "cryptography>=44.0.0",
     "pypomes_core>=1.7.1"
 ]
 

{pypomes_jwt-0.5.9 → pypomes_jwt-0.6.0}/src/pypomes_jwt/jwt_data.py

@@ -418,7 +418,9 @@ def jwt_validate_token(token: str,
     :raises InvalidSignatureError: signature does not match the one provided as part of the token
     """
     if logger:
-        logger.debug(msg=f"Verify request for JWT token '{token}'")
+        logger.debug(msg=f"Validate JWT token '{token}'")
     jwt.decode(jwt=token,
                key=key,
                algorithms=[algorithm])
+    if logger:
+        logger.debug(msg=f"Token '{token}' is valid")

{pypomes_jwt-0.5.9 → pypomes_jwt-0.6.0}/src/pypomes_jwt/jwt_pomes.py

@@ -1,7 +1,10 @@
 import contextlib
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.primitives.asymmetric import rsa
+from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey, RSAPublicKey
 from flask import Request, Response, request, jsonify
 from logging import Logger
-from OpenSSL import crypto
 from pypomes_core import APP_PREFIX, env_get_str, env_get_bytes, env_get_int
 from secrets import token_bytes
 from typing import Any, Final, Literal
@@ -19,14 +22,21 @@ JWT_HS_SECRET_KEY: Final[bytes] = env_get_bytes(key=f"{APP_PREFIX}_JWT_HS_SECRET
 # must invoke 'jwt_service()' below
 JWT_ENDPOINT_URL: Final[str] = env_get_str(key=f"{APP_PREFIX}_JWT_ENDPOINT_URL")
 
-__priv_key: bytes = env_get_bytes(key=f"{APP_PREFIX}_JWT_RSA_PRIVATE_KEY")
-__pub_key: bytes = env_get_bytes(key=f"{APP_PREFIX}_JWT_RSA_PUBLIC_KEY")
-if not __priv_key or not __pub_key:
-    pk = crypto.PKey()
-    __priv_key = crypto.dump_privatekey(crypto.FILETYPE_PEM, pk)
-    __pub_key = crypto.dump_publickey(crypto.FILETYPE_PEM, pk)
-JWT_RSA_PRIVATE_KEY: Final[bytes] = __priv_key
-JWT_RSA_PUBLIC_KEY: Final[bytes] = __pub_key
+# obtain a RSA private/public key pair
+__priv_bytes: bytes = env_get_bytes(key=f"{APP_PREFIX}_JWT_RSA_PRIVATE_KEY")
+__pub_bytes: bytes = env_get_bytes(key=f"{APP_PREFIX}_JWT_RSA_PUBLIC_KEY")
+if not __priv_bytes or not __pub_bytes:
+    __priv_key: RSAPrivateKey = rsa.generate_private_key(public_exponent=65537,
+                                                         key_size=2058,
+                                                         backend=default_backend())
+    __priv_bytes = __priv_key.private_bytes(encoding=serialization.Encoding.PEM,
+                                            format=serialization.PrivateFormat.TraditionalOpenSSL,
+                                            encryption_algorithm=serialization.NoEncryption())
+    __pub_key: RSAPublicKey = __priv_key.public_key()
+    __pub_bytes = __pub_key.public_bytes(encoding=serialization.Encoding.PEM,
+                                         format=serialization.PublicFormat.SubjectPublicKeyInfo)
+JWT_RSA_PRIVATE_KEY: Final[bytes] = __priv_bytes
+JWT_RSA_PUBLIC_KEY: Final[bytes] = __pub_bytes
 
 # the JWT data object
 __jwt_data: JwtData = JwtData()