diff options
Diffstat (limited to 'python/tests')
-rw-r--r-- | python/tests/IdentityProvider.py | 19 | ||||
-rw-r--r-- | python/tests/LibertyEnabledClientProxy.py | 6 | ||||
-rw-r--r-- | python/tests/Provider.py | 7 | ||||
-rw-r--r-- | python/tests/ServiceProvider.py | 14 |
4 files changed, 28 insertions, 18 deletions
diff --git a/python/tests/IdentityProvider.py b/python/tests/IdentityProvider.py index 4e3dd158..705899b2 100644 --- a/python/tests/IdentityProvider.py +++ b/python/tests/IdentityProvider.py @@ -83,13 +83,13 @@ class IdentityProviderMixin(Provider.ProviderMixin): # contentType = lecp.msg_content_type # failUnlessEqual(contentType, 'application/vnd.liberty-response+xml') contentType = 'application/vnd.liberty-response+xml' - return handler.respond( - headers = { - 'Content-Type': contentType, - 'Cache-Control': 'no-cache', - 'Pragma': 'no-cache', - }, - body = soapResponseMsg) + headers = { + 'Content-Type': contentType, + 'Cache-Control': 'no-cache', + 'Pragma': 'no-cache', + } + headers.update(self.libertyEnabledHeaders) + return handler.respond(headers = headers, body = soapResponseMsg) else: return handler.respond( 400, @@ -167,6 +167,11 @@ class IdentityProviderMixin(Provider.ProviderMixin): if requestType == lasso.requestTypeLogin: lassoServer = self.getLassoServer() login = lasso.Login.new(lassoServer) + # FIXME: What should we return when there is an error in process_request_msg? + # FIXME: Create a new Lasso function build_response_msg, with either None or + # soapResponseMessage as argument. It is called after process_request_message and + # should either create a new response or keep the one in soapResponseMsg (if it already + # contained an error or if there is no error). login.process_request_msg(soapRequestMsg) artifact = login.assertionArtifact failUnless(artifact) diff --git a/python/tests/LibertyEnabledClientProxy.py b/python/tests/LibertyEnabledClientProxy.py index 46a2f9dc..7c4d5647 100644 --- a/python/tests/LibertyEnabledClientProxy.py +++ b/python/tests/LibertyEnabledClientProxy.py @@ -88,6 +88,9 @@ class LibertyEnabledClientProxyMixin(abstractweb.WebClientMixin): httpResponse = self.sendHttpRequestToSite(site, 'GET', path) failUnlessEqual( httpResponse.headers['Content-Type'], 'application/vnd.liberty-request+xml') + libertyEnabledHeader = httpResponse.headers.get('Liberty-Enabled') + failUnless(libertyEnabledHeader) + failUnless('LIBV=urn:liberty:iff:2003-08' in libertyEnabledHeader) lassoServer = self.getLassoServer() lecp = lasso.Lecp.new(lassoServer) authnRequestEnvelope = httpResponse.body @@ -102,6 +105,9 @@ class LibertyEnabledClientProxyMixin(abstractweb.WebClientMixin): body = lecp.msg_body) failUnlessEqual( httpResponse.headers.get('Content-Type', None), 'application/vnd.liberty-response+xml') + libertyEnabledHeader = httpResponse.headers.get('Liberty-Enabled') + failUnless(libertyEnabledHeader) + failUnless('LIBV=urn:liberty:iff:2003-08' in libertyEnabledHeader) lecp.process_authn_response_envelope_msg(httpResponse.body) lecp.build_authn_response_msg() failUnless(lecp.msg_url) diff --git a/python/tests/Provider.py b/python/tests/Provider.py index 07a62ed0..5f40dad9 100644 --- a/python/tests/Provider.py +++ b/python/tests/Provider.py @@ -28,11 +28,10 @@ import abstractweb class ProviderMixin(abstractweb.WebSiteMixin): - httpResponseHeaders = abstractweb.WebSiteMixin.httpResponseHeaders.copy() - httpResponseHeaders.update({ - 'Liberty-Enabled': 'LIBV=urn:liberty:iff:2003-08,http://projectliberty.org/specs/v1', - }) lassoServerDump = None + libertyEnabledHeaders = { + 'Liberty-Enabled': 'LIBV=urn:liberty:iff:2003-08,http://projectliberty.org/specs/v1', + } providerId = None # The Liberty providerID of this web site sessionTokensByNameIdentifier = None userIdsByNameIdentifier = None diff --git a/python/tests/ServiceProvider.py b/python/tests/ServiceProvider.py index b616a87f..d5d654a0 100644 --- a/python/tests/ServiceProvider.py +++ b/python/tests/ServiceProvider.py @@ -234,13 +234,13 @@ class ServiceProviderMixin(Provider.ProviderMixin): # contentType = lecp.msg_content_type # failUnlessEqual(contentType, 'application/vnd.liberty-request+xml') contentType = 'application/vnd.liberty-request+xml' - return handler.respond( - headers = { - 'Content-Type': contentType, - 'Cache-Control': 'no-cache', - 'Pragma': 'no-cache', - }, - body = authnRequestEnvelopeMsg) + headers = { + 'Content-Type': contentType, + 'Cache-Control': 'no-cache', + 'Pragma': 'no-cache', + } + headers.update(self.libertyEnabledHeaders) + return handler.respond(headers = headers, body = authnRequestEnvelopeMsg) else: login = lasso.Login.new(lassoServer) login.init_authn_request() |