From 27cc0f85a434eb6d4dabe1b1cd615e43afff4352 Mon Sep 17 00:00:00 2001 From: Roland Hedberg Date: Mon, 19 Nov 2012 12:46:26 +0100 Subject: [PATCH] method name change --- src/saml2/server.py | 7 ++++--- src/saml2/sigver.py | 14 ++++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/saml2/server.py b/src/saml2/server.py index 448095a..4770da4 100644 --- a/src/saml2/server.py +++ b/src/saml2/server.py @@ -345,15 +345,16 @@ class Server(object): try: # What's the binding ? ProtocolBinding _binding = authn_request.message.protocol_binding - consumer_url = self.metadata.consumer_url(sp_entity_id, - binding=_binding) + consumer_url = self.metadata.assertion_consumer_service(sp_entity_id, + binding=_binding)[0] except KeyError: _log_info("Failed to find consumer URL for %s" % sp_entity_id) _log_info("entities: %s" % self.metadata.entity.keys()) raise UnknownPrincipal(sp_entity_id) 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) response["sp_entity_id"] = sp_entity_id diff --git a/src/saml2/sigver.py b/src/saml2/sigver.py index 4964a49..2b3a68b 100644 --- a/src/saml2/sigver.py +++ b/src/saml2/sigver.py @@ -79,13 +79,19 @@ def get_xmlsec_binary(paths=None): if paths: for path in paths: fil = os.path.join(path, bin_name) - if os.access(fil, os.X_OK): - return fil + try: + if os.lstat(fil): + return fil + except Exception: + pass for path in os.environ["PATH"].split(":"): fil = os.path.join(path, bin_name) - if os.access(fil, os.X_OK): - return fil + try: + if os.lstat(fil): + return fil + except Exception: + pass raise Exception("Can't find %s" % bin_name)