pypomes-jwt 0.5.0__tar.gz → 0.5.2__tar.gz

{pypomes_jwt-0.5.0 → pypomes_jwt-0.5.2}/PKG-INFO

@@ -1,18 +1,17 @@
 Metadata-Version: 2.3
 Name: pypomes_jwt
-Version: 0.5.0
+Version: 0.5.2
 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
 Author-email: GT Nunes <wisecoder01@gmail.com>
-License-File: LICENSE
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.10
-Requires-Dist: pip>=24.2
-Requires-Dist: pyjwt>=2.9.0
-Requires-Dist: pypomes-core>=1.5.3
-Requires-Dist: pypomes-crypto>=0.3.0
-Requires-Dist: setuptools>=75.1.0
-Requires-Dist: wheel>=0.44.0
+Requires-Python: >=3.12
+Requires-Dist: pip>=24.3.1
+Requires-Dist: pyjwt>=2.10.0
+Requires-Dist: pyopenssl>=24.2.1
+Requires-Dist: pypomes-core>=1.6.2
+Requires-Dist: setuptools>=75.5.0
+Requires-Dist: wheel>=0.45.0

{pypomes_jwt-0.5.0 → pypomes_jwt-0.5.2}/pyproject.toml

@@ -6,25 +6,25 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pypomes_jwt"
-version = "0.5.0"
+version = "0.5.2"
 authors = [
   { name="GT Nunes", email="wisecoder01@gmail.com" }
 ]
 description = "A collection of Python pomes, penyeach (JWT module)"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent"
 ]
 dependencies = [
-    "pip>=24.2",
-    "PyJWT>=2.9.0",
-    "pypomes_core>=1.5.3",
-    "pypomes_crypto>=0.3.0",
-    "setuptools>=75.1.0",
-    "wheel>=0.44.0"
+    "pip>=24.3.1",
+    "PyJWT>=2.10.0",
+    "PyOpenSSL>=24.2.1",
+    "pypomes_core>=1.6.2",
+    "setuptools>=75.5.0",
+    "wheel>=0.45.0"
 ]
 
 [project.urls]

{pypomes_jwt-0.5.0 → pypomes_jwt-0.5.2}/src/pypomes_jwt/jwt_data.py

@@ -1,7 +1,7 @@
 import jwt
 import math
 import requests
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from jwt.exceptions import InvalidTokenError
 from logging import Logger
 from requests import Response
@@ -60,8 +60,8 @@ class JwtData:
                         access_max_age: int,
                         refresh_max_age: int,
                         secret_key: bytes,
-                        private_key: str,
-                        public_key: str,
+                        private_key: bytes,
+                        public_key: bytes,
                         request_timeout: float,
                         local_provider: bool,
                         logger: Logger = None) -> None:
@@ -98,7 +98,7 @@ class JwtData:
                 "access-max-age": access_max_age,
                 "request-timeout": request_timeout,
                 "local-provider": local_provider,
-                "refresh-exp": datetime.utcnow() + timedelta(seconds=refresh_max_age)
+                "refresh-exp": datetime.now(timezone.utc) + timedelta(seconds=refresh_max_age)
             }
             if algorithm in ["HS256", "HS512"]:
                 control_data["secret-key"] = secret_key
@@ -190,7 +190,7 @@ class JwtData:
             control_data: dict[str, Any] = item_data.get("control-data")
             custom_claims: dict[str, Any] = item_data.get("custom-claims")
             standard_claims: dict[str, Any] = item_data.get("standard-claims")
-            just_now: datetime = datetime.utcnow()
+            just_now: datetime = datetime.now(timezone.utc)
 
             # is the current token still valid ?
             if just_now > standard_claims.get("exp"):

{pypomes_jwt-0.5.0 → pypomes_jwt-0.5.2}/src/pypomes_jwt/jwt_pomes.py

@@ -1,8 +1,8 @@
 import contextlib
 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 pypomes_crypto import crypto_generate_rsa_keys
 from secrets import token_bytes
 from typing import Any, Final, Literal
 
@@ -19,12 +19,14 @@ JWT_HS_SECRET_KEY: Final[bytes] = env_get_bytes(key=f"{APP_PREFIX}_JWT_HS_SECRET
 # must point to 'jwt_service()' below
 JWT_ENDPOINT_URL: Final[str] = env_get_str(key=f"{APP_PREFIX}_JWT_ENDPOINT_URL")
 
-__priv_key: str = env_get_str(key=f"{APP_PREFIX}_JWT_RSA_PRIVATE_KEY")
-__pub_key: str = env_get_str(key=f"{APP_PREFIX}_JWT_RSA_PUBLIC_KEY")
+__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:
-    (__priv_key, __pub_key) = crypto_generate_rsa_keys(key_size=2048)
-JWT_RSA_PRIVATE_KEY: Final[str] = __priv_key
-JWT_RSA_PUBLIC_KEY: Final[str] = __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
 
 # the JWT data object
 __jwt_data: JwtData = JwtData()
@@ -53,8 +55,8 @@ def jwt_set_service_access(service_url: str,
                            access_max_age: int = JWT_ACCESS_MAX_AGE,
                            refresh_max_age: int = JWT_REFRESH_MAX_AGE,
                            secret_key: bytes = JWT_HS_SECRET_KEY,
-                           private_key: str = JWT_RSA_PRIVATE_KEY,
-                           public_key: str = JWT_RSA_PUBLIC_KEY,
+                           private_key: bytes = JWT_RSA_PRIVATE_KEY,
+                           public_key: bytes = JWT_RSA_PUBLIC_KEY,
                            request_timeout: int = None,
                            local_provider: bool = False,
                            logger: Logger = None) -> None: