pypomes-jwt 0.4.7__py3-none-any.whl → 0.4.9__py3-none-any.whl

pypomes_jwt/__init__.py

@@ -5,8 +5,8 @@ from .jwt_pomes import (
     JWT_ENDPOINT_URL,
     JWT_ACCESS_MAX_AGE, JWT_REFRESH_MAX_AGE,
     JWT_HS_SECRET_KEY, JWT_RSA_PRIVATE_KEY, JWT_RSA_PUBLIC_KEY,
-    jwt_get_token, jwt_get_token_data,
-    jwt_get_claims, jwt_verify_request,
+    jwt_needed, jwt_verify_request,
+    jwt_get_claims, jwt_get_token, jwt_get_token_data,
     jwt_service, jwt_set_service_access, jwt_remove_service_access
 )
 
@@ -17,8 +17,8 @@ __all__ = [
     "JWT_ENDPOINT_URL",
     "JWT_ACCESS_MAX_AGE", "JWT_REFRESH_MAX_AGE",
     "JWT_HS_SECRET_KEY", "JWT_RSA_PRIVATE_KEY", "JWT_RSA_PUBLIC_KEY",
-    "jwt_get_token", "jwt_get_token_data",
-    "jwt_get_claims", "jwt_verify_request",
+    "jwt_needed", "jwt_verify_request",
+    "jwt_get_claims", "jwt_get_token", "jwt_get_token_data",
     "jwt_service", "jwt_set_service_access", "jwt_remove_service_access"
 ]
 

pypomes_jwt/jwt_pomes.py

@@ -14,13 +14,13 @@ JWT_ACCESS_MAX_AGE: Final[int] = env_get_int(key=f"{APP_PREFIX}_JWT_ACCESS_MAX_A
                                              def_value=3600)
 JWT_REFRESH_MAX_AGE: Final[int] = env_get_int(key=f"{APP_PREFIX}_JWT_REFRESH_MAX_AGE",
                                               def_value=43200)
-JWT_HS_SECRET_KEY: Final[bytes] = env_get_bytes(key=f"{APP_PREFIX}JWT_HS_SECRET_KEY",
+JWT_HS_SECRET_KEY: Final[bytes] = env_get_bytes(key=f"{APP_PREFIX}_JWT_HS_SECRET_KEY",
                                                 def_value=token_bytes(32))
 # 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: 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")
 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
@@ -30,6 +30,20 @@ JWT_RSA_PUBLIC_KEY: Final[str] = __pub_key
 __jwt_data: JwtData = JwtData()
 
 
+def jwt_needed(func: callable) -> callable:
+    """
+    Create a decorator to authenticate service endpoints with JWT tokens.
+
+    :param func: the function being decorated
+    """
+    # ruff: noqa: ANN003
+    def wrapper(*args, **kwargs) -> Response:
+        response: Response = jwt_verify_request(request=request) if JWT_ENDPOINT_URL else None
+        return response if response else func(*args, **kwargs)
+
+    return wrapper
+
+
 def jwt_set_service_access(service_url: str,
                            claims: dict[str, Any],
                            algorithm: Literal["HS256", "HS512", "RSA256", "RSA512"] = JWT_DEFAULT_ALGORITHM,
@@ -206,14 +220,14 @@ def jwt_verify_request(request: Request,
                               status=401)
     else:
         # no, report the error
-        result = Response(response="Authorization failed, as no JWT token was provided",
+        result = Response(response="Authorization failed",
                           status=401)
 
     return result
 
 
 # @flask_app.route(rule="/jwt-service",
-#                  methods=["GET", "POST"])
+#                  methods=["POST"])
 def jwt_service(service_url: str = None) -> Response:
     """
     Entry point for obtaining JWT tokens.

{pypomes_jwt-0.4.7.dist-info → pypomes_jwt-0.4.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pypomes_jwt
-Version: 0.4.7
+Version: 0.4.9
 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
@@ -12,7 +12,7 @@ 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.1
-Requires-Dist: pypomes-crypto>=0.2.9
+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

pypomes_jwt-0.4.9.dist-info/RECORD

@@ -0,0 +1,7 @@
+pypomes_jwt/__init__.py,sha256=1IyBb94cZjkXMibHrH_vh043b06QFh5UQ6HTYSDau28,978
+pypomes_jwt/jwt_data.py,sha256=g8wnWYI7bueCIuK67eW2Uy21ALYk5RbLigUHwljjzt4,17496
+pypomes_jwt/jwt_pomes.py,sha256=aPvoBhUqRCQ3yzXGab-RNvELLFlWvmZsDUNCas5VbDA,10950
+pypomes_jwt-0.4.9.dist-info/METADATA,sha256=eb0MR5tHfoEGPmB9JjPOimSer5hwR5QRrU2j98Wsarg,687
+pypomes_jwt-0.4.9.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+pypomes_jwt-0.4.9.dist-info/licenses/LICENSE,sha256=NdakochSXm_H_-DSL_x2JlRCkYikj3snYYvTwgR5d_c,1086
+pypomes_jwt-0.4.9.dist-info/RECORD,,

pypomes_jwt-0.4.7.dist-info/RECORD

@@ -1,7 +0,0 @@
-pypomes_jwt/__init__.py,sha256=wIbTPmnxyGFuSdawdyglNn7GVKEvPZ_57MF9HBbWclc,952
-pypomes_jwt/jwt_data.py,sha256=g8wnWYI7bueCIuK67eW2Uy21ALYk5RbLigUHwljjzt4,17496
-pypomes_jwt/jwt_pomes.py,sha256=z8T28KRL09mk3wg3weU3F7SBE6pRapB6T9zmlq9Rv1U,10538
-pypomes_jwt-0.4.7.dist-info/METADATA,sha256=OyqPFEIyfKvw4FtnawyNzwx81vLITmcArlS3Y8AF8VU,687
-pypomes_jwt-0.4.7.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-pypomes_jwt-0.4.7.dist-info/licenses/LICENSE,sha256=NdakochSXm_H_-DSL_x2JlRCkYikj3snYYvTwgR5d_c,1086
-pypomes_jwt-0.4.7.dist-info/RECORD,,