pypomes-jwt 0.5.1__py3-none-any.whl → 0.5.2__py3-none-any.whl

pypomes_jwt/jwt_data.py

@@ -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:

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:

{pypomes_jwt-0.5.1.dist-info → pypomes_jwt-0.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pypomes_jwt
-Version: 0.5.1
+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
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3
 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: pypomes-crypto>=0.3.1
 Requires-Dist: setuptools>=75.5.0
 Requires-Dist: wheel>=0.45.0

pypomes_jwt-0.5.2.dist-info/RECORD

@@ -0,0 +1,7 @@
+pypomes_jwt/__init__.py,sha256=1IyBb94cZjkXMibHrH_vh043b06QFh5UQ6HTYSDau28,978
+pypomes_jwt/jwt_data.py,sha256=pXw4MrUAXbLhs12y7F2KVTq78unvHi5JqM2v5EaD-Pw,17528
+pypomes_jwt/jwt_pomes.py,sha256=kXvoJt6F8CbYipFRXDa8rMQF2LJuwCFFjJTHU50hoQE,11164
+pypomes_jwt-0.5.2.dist-info/METADATA,sha256=xy4my_vSAon1fHq506HvkEcQEH5diVMW4OikaRcorow,664
+pypomes_jwt-0.5.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+pypomes_jwt-0.5.2.dist-info/licenses/LICENSE,sha256=NdakochSXm_H_-DSL_x2JlRCkYikj3snYYvTwgR5d_c,1086
+pypomes_jwt-0.5.2.dist-info/RECORD,,

pypomes_jwt-0.5.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-pypomes_jwt/__init__.py,sha256=1IyBb94cZjkXMibHrH_vh043b06QFh5UQ6HTYSDau28,978
-pypomes_jwt/jwt_data.py,sha256=iRyJZhmx1NJOMXAvJUB5yTIZSTgutQ0fFeYmvmyzo2o,17524
-pypomes_jwt/jwt_pomes.py,sha256=IKfpvC3FO3ts-xfHQMxkPYQjeUjWrbVFOqXnNYJTKnM,11090
-pypomes_jwt-0.5.1.dist-info/METADATA,sha256=3dHLb84c8txBDFYagpN4rFjNIw2zbvtHeiuCJ7h_Ll0,668
-pypomes_jwt-0.5.1.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-pypomes_jwt-0.5.1.dist-info/licenses/LICENSE,sha256=NdakochSXm_H_-DSL_x2JlRCkYikj3snYYvTwgR5d_c,1086
-pypomes_jwt-0.5.1.dist-info/RECORD,,