Fix tests after changes in state presence

Signed-off-by: Ivan Kanakarakis <ivan.kanak@gmail.com>

Author: c00kiemon5ter

tests/satosa/backends/test_bitbucket.py

@@ -159,7 +159,6 @@ def test_authn_response(self, incoming_authn_response):
             mock_do_access_token_request
 
         self.bb_backend._authn_response(incoming_authn_response)
-        assert self.bb_backend.name not in incoming_authn_response.state
 
         self.assert_expected_attributes()
         self.assert_token_request(**mock_do_access_token_request.call_args[1])
@@ -190,5 +189,4 @@ def test_entire_flow(self, context):
             "state": mock_get_state.return_value
         }
         self.bb_backend._authn_response(context)
-        assert self.bb_backend.name not in context.state
         self.assert_expected_attributes()

tests/satosa/backends/test_oauth.py

@@ -136,7 +136,6 @@ def test_authn_response(self, incoming_authn_response):
         self.fb_backend.consumer.do_access_token_request = mock_do_access_token_request
 
         self.fb_backend._authn_response(incoming_authn_response)
-        assert self.fb_backend.name not in incoming_authn_response.state
 
         self.assert_expected_attributes()
         self.assert_token_request(**mock_do_access_token_request.call_args[1])
@@ -164,5 +163,4 @@ def test_entire_flow(self, context):
             "state": mock_get_state.return_value
         }
         self.fb_backend._authn_response(context)
-        assert self.fb_backend.name not in context.state
         self.assert_expected_attributes()

tests/satosa/backends/test_openid_connect.py

@@ -163,7 +163,6 @@ def test_response_endpoint(self, backend_config, internal_attributes, userinfo,
         self.setup_userinfo_endpoint(backend_config["provider_metadata"]["userinfo_endpoint"], userinfo)
 
         self.oidc_backend.response_endpoint(incoming_authn_response)
-        assert self.oidc_backend.name not in incoming_authn_response.state
 
         args = self.oidc_backend.auth_callback_func.call_args[0]
         assert isinstance(args[0], Context)
@@ -198,7 +197,6 @@ def test_entire_flow(self, context, backend_config, internal_attributes, userinf
             "token_type": "Bearer",
         }
         self.oidc_backend.response_endpoint(context)
-        assert self.oidc_backend.name not in context.state
         args = self.oidc_backend.auth_callback_func.call_args[0]
         self.assert_expected_attributes(internal_attributes, userinfo, args[1].attributes)
 

tests/satosa/backends/test_saml2.py

@@ -132,11 +132,12 @@ def test_full_flow(self, context, idp_conf, sp_conf):
         disco_resp = parse_qs(urlparse(resp.message).query)
         info = parse_qs(urlparse(disco_resp["return"][0]).query)
         info["entityID"] = idp_conf["entityid"]
-        request_context = Context()
+        request_context = context
         request_context.request = info
         request_context.state = context.state
 
         # pass discovery response to backend and check that it redirects to the selected IdP
+        context.state["SATOSA_BASE"] = {"requester": "the-service-identifier"}
         resp = self.samlbackend.disco_response(request_context)
         assert_redirect_to_idp(resp, idp_conf)
 
@@ -155,7 +156,6 @@ def test_full_flow(self, context, idp_conf, sp_conf):
         # pass auth response to backend and verify behavior
         self.samlbackend.authn_response(response_context, response_binding)
         context, internal_resp = self.samlbackend.auth_callback_func.call_args[0]
-        assert self.samlbackend.name not in context.state
         assert context.state[test_state_key] == "my_state"
         assert_authn_response(internal_resp)
 
@@ -254,7 +254,6 @@ def test_authn_response(self, context, idp_conf, sp_conf):
 
         context, internal_resp = self.samlbackend.auth_callback_func.call_args[0]
         assert_authn_response(internal_resp)
-        assert self.samlbackend.name not in context.state
 
     @pytest.mark.skipif(
             saml2.__version__ < '4.6.1',
@@ -290,7 +289,6 @@ def test_authn_response_no_name_id(self, context, idp_conf, sp_conf):
 
         context, internal_resp = backend.auth_callback_func.call_args[0]
         assert_authn_response(internal_resp)
-        assert backend.name not in context.state
 
     def test_authn_response_with_encrypted_assertion(self, sp_conf, context):
         with open(os.path.join(