chore: unite test for opt-out trust param header

Author: Zicchio

pyeudiw/tests/satosa/test_backend.py

@@ -467,7 +467,6 @@ def test_response_endpoint(self, context):
 
         # case (4): good aud, nonce and state
         good_response = self._generate_payload(self.issuer_jwk, self.holder_jwk, nonce, state, self.backend.client_id)
-
         encrypted_response = JWEHelper(
             CONFIG["metadata_jwks"][1]).encrypt(good_response)
         context.request = {
@@ -919,6 +918,7 @@ def test_trust_parameters_in_response(self, context):
                 jwks=[JWK(key=ta_jwk).as_dict()],
                 expiration_date=datetime.datetime.now(),
                 trust_chain=trust_chain_wallet,
+                trust_handler_name="FederationHandler",
             )
         )
 

pyeudiw/tests/trust/mock_trust_handler.py

@@ -32,6 +32,7 @@ class MockTrustHandler(TrustHandlerInterface):
     def __init__(self, *args, **kwargs):
         self.client_id = kwargs.get("default_client_id", None)
         self.exp = kwargs.get("exp", 10)
+        self.include_issued_jwt_header_param = kwargs.get("include_issued_jwt_header_param", False)
 
     def get_metadata(self, issuer: str, trust_source: TrustSourceData) -> dict:
         if issuer == self.client_id:

pyeudiw/tests/trust/test_dynamic.py

@@ -52,14 +52,13 @@ def test_public_key_and_metadata_retrive():
             "mock": {
                 "module": "pyeudiw.tests.trust.mock_trust_handler",
                 "class": "MockTrustHandler",
-                "config": {},
+                "config": {"include_issued_jwt_header_param": True},
             },
 
         }, db_engine, default_client_id="default-client-id", mode="update_first"
     )
 
     uuid_url = f"http://{uuid4()}.issuer.it"
-
     assert trust_ev.get_jwt_header_trust_parameters(uuid_url) == {'trust_param_name': {'trust_param_key': 'trust_param_value'}}
     metadata = trust_ev.get_metadata()
 
@@ -82,7 +81,7 @@ def test_update_first_strategy():
             "mock": {
                 "module": "pyeudiw.tests.trust.mock_trust_handler",
                 "class": "UpdateTrustHandler",
-                "config": {},
+                "config":  {"include_issued_jwt_header_param": True},
             },
 
         }, db_engine, default_client_id="default-client-id"
@@ -102,7 +101,7 @@ def test_cache_first_strategy():
             "mock": {
                 "module": "pyeudiw.tests.trust.mock_trust_handler",
                 "class": "UpdateTrustHandler",
-                "config": {},
+                "config":  {"include_issued_jwt_header_param": True},
             },
 
         }, db_engine, default_client_id="default-client-id", mode="cache_first"
@@ -122,7 +121,8 @@ def test_cache_first_strategy_expired():
                 "module": "pyeudiw.tests.trust.mock_trust_handler",
                 "class": "UpdateTrustHandler",
                 "config": {
-                    "exp": 0
+                    "exp": 0,
+                    "include_issued_jwt_header_param": True
                 },
             },
 
@@ -143,7 +143,7 @@ def test_cache_first_strategy_expired_revoked():
             "mock": {
                 "module": "pyeudiw.tests.trust.mock_trust_handler",
                 "class": "UpdateTrustHandler",
-                "config": {},
+                "config": {"include_issued_jwt_header_param": True},
             },
 
         }, db_engine, default_client_id="default-client-id", mode="cache_first"
@@ -166,7 +166,7 @@ def test_cache_first_strategy_expired_force_update():
             "mock": {
                 "module": "pyeudiw.tests.trust.mock_trust_handler",
                 "class": "UpdateTrustHandler",
-                "config": {},
+                "config":  {"include_issued_jwt_header_param": True},
             },
 
         }, db_engine, default_client_id="default-client-id", mode="cache_first"

pyeudiw/trust/dynamic.py

@@ -308,7 +308,6 @@ def get_jwt_header_trust_parameters(self, issuer: Optional[str] = None, force_up
         trust_source = self._get_trust_source(issuer, force_update)
 
         headers_params = {}
-
         for handler in self.handlers:
             if getattr(handler, INCLUDE_JWT_HEADER_CONFIG_NAME, None):
                 if header := handler.extract_jwt_header_trust_parameters(trust_source):

pyeudiw/trust/handler/federation.py

@@ -49,6 +49,7 @@ def __init__(
         httpc_params: dict = DEFAULT_HTTPC_PARAMS,
         cache_ttl: int = 0,
         metadata_type: str = _ISSUER_METADATA_TYPE,
+        include_issued_jwt_header_param: bool = False,
         **kwargs,
     ):
 
@@ -68,6 +69,7 @@ def __init__(
         self.federation_entity_metadata: dict[str, str] = federation_entity_metadata
         self.client_id: str = federation_entity_metadata
         self.entity_configuration_exp = entity_configuration_exp
+        self.include_issued_jwt_header_param = include_issued_jwt_header_param
 
         self.federation_public_jwks = [
             JWK(i).as_public_dict() for i in self.federation_jwks