diff options
| -rw-r--r-- | src/saml2/client.py | 10 | ||||
| -rw-r--r-- | tests/test_51_client.py | 24 |
2 files changed, 26 insertions, 8 deletions
diff --git a/src/saml2/client.py b/src/saml2/client.py index 9919492b..c23fc8c2 100644 --- a/src/saml2/client.py +++ b/src/saml2/client.py @@ -60,7 +60,8 @@ class Saml2Client(Base): binding=saml2.BINDING_HTTP_REDIRECT, vorg="", nameid_format=NAMEID_FORMAT_PERSISTENT, scoping=None, consent=None, extensions=None, - sign=None): + sign=None, + response_binding=saml2.BINDING_HTTP_POST): """ Makes all necessary preparations for an authentication request. :param entityid: The entity ID of the IdP to send the request to @@ -72,14 +73,15 @@ class Saml2Client(Base): :param consent: Whether the principal have given her consent :param extensions: Possible extensions :param sign: Whether the request should be signed or not. + :param response_binding: Which binding to use for receiving the response :return: session id and AuthnRequest info """ destination = self._sso_location(entityid, binding) - req = self.create_authn_request(destination, vorg, scoping, binding, - nameid_format, consent, extensions, - sign) + req = self.create_authn_request(destination, vorg, scoping, + response_binding, nameid_format, + consent, extensions, sign) _req_str = "%s" % req logger.info("AuthNReq: %s" % _req_str) diff --git a/tests/test_51_client.py b/tests/test_51_client.py index 54445d49..548c8965 100644 --- a/tests/test_51_client.py +++ b/tests/test_51_client.py @@ -3,10 +3,11 @@ import base64 import urllib +import urlparse from saml2.response import LogoutResponse from saml2.client import Saml2Client -from saml2 import samlp, BINDING_HTTP_POST +from saml2 import samlp, BINDING_HTTP_POST, BINDING_HTTP_REDIRECT from saml2 import saml, config, class_name from saml2.config import SPConfig from saml2.saml import NAMEID_FORMAT_PERSISTENT @@ -334,13 +335,22 @@ class TestClientWithDummy(): self.client.send = self.server.receive def test_do_authn(self): + binding = BINDING_HTTP_REDIRECT + response_binding = BINDING_HTTP_POST sid, http_args = self.client.prepare_for_authenticate( - IDP, "http://www.example.com/relay_state") + IDP, "http://www.example.com/relay_state", + binding=binding, response_binding=response_binding) assert isinstance(sid, basestring) assert len(http_args) == 4 assert http_args["headers"][0][0] == "Location" assert http_args["data"] == [] + redirect_url = http_args["headers"][0][1] + _, _, _, _, qs, _ = urlparse.urlparse(redirect_url) + qs_dict = urlparse.parse_qs(qs) + req = self.server.parse_authn_request(qs_dict["SAMLRequest"][0], binding) + resp_args = self.server.response_args(req.message, [response_binding]) + assert resp_args["binding"] == response_binding def test_do_attribute_query(self): response = self.client.do_attribute_query( @@ -374,15 +384,21 @@ class TestClientWithDummy(): assert isinstance(response, LogoutResponse) def test_post_sso(self): + binding=BINDING_HTTP_POST + response_binding=BINDING_HTTP_POST sid, http_args = self.client.prepare_for_authenticate( "urn:mace:example.com:saml:roland:idp", relay_state="really", - binding=BINDING_HTTP_POST) + binding=binding, response_binding=response_binding) + _dic = unpack_form(http_args["data"][3]) + + req = self.server.parse_authn_request(_dic["SAMLRequest"], binding) + resp_args = self.server.response_args(req.message, [response_binding]) + assert resp_args["binding"] == response_binding # Normally a response would now be sent back to the users web client # Here I fake what the client will do # create the form post - _dic = unpack_form(http_args["data"][3]) http_args["data"] = urllib.urlencode(_dic) http_args["method"] = "POST" http_args["dummy"] = _dic["SAMLRequest"] |