openstack/deb-python-pysaml2
Code Issues Proposed changes

method name change

Browse Source
This commit is contained in:
Roland Hedberg
2012-11-19 12:46:26 +01:00
parent ce15badb7d
commit 27cc0f85a4
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/saml2/server.py
View File

@@ -345,15 +345,16 @@ class Server(object):
try: try:
# What's the binding ? ProtocolBinding # What's the binding ? ProtocolBinding
_binding = authn_request.message.protocol_binding _binding = authn_request.message.protocol_binding
consumer_url = self.metadata.consumer_url(sp_entity_id, consumer_url = self.metadata.assertion_consumer_service(sp_entity_id,
binding=_binding) binding=_binding)[0]
except KeyError: except KeyError:
_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)
if not consumer_url: # what to do ? if not consumer_url: # what to do ?
_log_info("Couldn't find a consumer URL binding=%s" % _binding) _log_info("Couldn't find a consumer URL binding=%s entity_id=%s" % (
_binding,sp_entity_id))
raise UnsupportedBinding(sp_entity_id) raise UnsupportedBinding(sp_entity_id)
response["sp_entity_id"] = sp_entity_id response["sp_entity_id"] = sp_entity_id

14
src/saml2/sigver.py
View File

@@ -79,13 +79,19 @@ def get_xmlsec_binary(paths=None):
if paths: if paths:
for path in paths: for path in paths:
fil = os.path.join(path, bin_name) fil = os.path.join(path, bin_name)
if os.access(fil, os.X_OK): try:
return fil if os.lstat(fil):
return fil
except Exception:
pass
for path in os.environ["PATH"].split(":"): for path in os.environ["PATH"].split(":"):
fil = os.path.join(path, bin_name) fil = os.path.join(path, bin_name)
if os.access(fil, os.X_OK): try:
return fil if os.lstat(fil):
return fil
except Exception:
pass
raise Exception("Can't find %s" % bin_name) raise Exception("Can't find %s" % bin_name)