openstack/deb-python-pysaml2
Code Issues Proposed changes

Not plural.

Browse Source
This commit is contained in:
Roland Hedberg
2012-11-27 14:15:44 +01:00
parent 123fce0f44
commit 99b3b46d16
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/saml2/config.py
View File

@@ -370,8 +370,7 @@ class SPConfig(Config):
the SOAP binding) the SOAP binding)
:return: list of endpoints :return: list of endpoints
""" """
return self.metadata.single_logout_services(entity_id, "idp", return self.metadata.single_logout_service(entity_id, binding=binding)
binding=binding)
def single_sign_on_services(self, entity_id, def single_sign_on_services(self, entity_id,
binding=BINDING_HTTP_REDIRECT): binding=BINDING_HTTP_REDIRECT):
@@ -381,8 +380,7 @@ class SPConfig(Config):
:param binding: The preferred binding :param binding: The preferred binding
:return: list of endpoints :return: list of endpoints
""" """
return self.metadata.single_sign_on_services(entity_id, return self.metadata.single_sign_on_service(entity_id, binding=binding)
binding=binding)
def attribute_services(self, entity_id, binding=BINDING_SOAP): def attribute_services(self, entity_id, binding=BINDING_SOAP):
""" returns a list of endpoints to use for attribute requests to """ returns a list of endpoints to use for attribute requests to
@@ -461,8 +459,7 @@ class IdPConfig(Config):
:return: list of endpoints :return: list of endpoints
""" """
return self.metadata.single_logout_services(entity_id, "sp", return self.metadata.single_logout_service(entity_id, binding=binding)
binding=binding)
def assertion_consumer_services(self, entity_id, binding=BINDING_HTTP_POST): def assertion_consumer_services(self, entity_id, binding=BINDING_HTTP_POST):
return self.metadata.assertion_consumer_services(entity_id, binding) return self.metadata.assertion_consumer_services(entity_id, binding)

2
src/saml2/server.py
View File

@@ -347,7 +347,7 @@ class Server(object):
_binding = authn_request.message.protocol_binding _binding = authn_request.message.protocol_binding
consumer_url = self.metadata.assertion_consumer_service(sp_entity_id, consumer_url = self.metadata.assertion_consumer_service(sp_entity_id,
binding=_binding)[0] binding=_binding)[0]
except KeyError: except (KeyError, IndexError):
_log_info("Failed to find consumer URL for %s" % sp_entity_id) _log_info("Failed to find consumer URL for %s" % sp_entity_id)
_log_info("entities: %s" % self.metadata.entity.keys()) _log_info("entities: %s" % self.metadata.entity.keys())
raise UnknownPrincipal(sp_entity_id) raise UnknownPrincipal(sp_entity_id)