From 8d8e04b2c9ffb07375b466ab56788897fc0332af Mon Sep 17 00:00:00 2001 From: Roland Hedberg Date: Mon, 14 Mar 2011 13:25:33 +0100 Subject: [PATCH] Don't do massive find replace will always get you into problem --- src/saml2/metadata.py | 3 ++- src/saml2/request.py | 3 ++- src/saml2/response.py | 6 ++++-- src/saml2/server.py | 14 +++++++++----- src/saml2/sigver.py | 6 ++++-- src/saml2/soap.py | 3 ++- src/saml2/virtual_org.py | 4 ++-- 7 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/saml2/metadata.py b/src/saml2/metadata.py index 3989a4c..fce4de9 100644 --- a/src/saml2/metadata.py +++ b/src/saml2/metadata.py @@ -372,7 +372,8 @@ class MetaData(object): self.import_metadata(content, (url, cert)) return True else: - self.if log: self.log.info("Response status: %s" % response.status) + if self.log: + self.log.info("Response status: %s" % response.status) return False def idp_services(self, entity_id, typ, binding=None): diff --git a/src/saml2/request.py b/src/saml2/request.py index 37cb753..a08e1c5 100644 --- a/src/saml2/request.py +++ b/src/saml2/request.py @@ -52,7 +52,8 @@ class Request(object): except TypeError: raise except Exception, excp: - self.if log: self.log.info("EXCEPTION: %s", excp) + if self.log: + self.log.info("EXCEPTION: %s", excp) if not self.message: if self.log: diff --git a/src/saml2/response.py b/src/saml2/response.py index e815da0..ee7552f 100644 --- a/src/saml2/response.py +++ b/src/saml2/response.py @@ -153,7 +153,8 @@ class StatusResponse(object): except SignatureError: raise except Exception, excp: - self.if log: self.log.info("EXCEPTION: %s", excp) + if self.log: + self.log.info("EXCEPTION: %s", excp) print "<", self.response @@ -321,7 +322,8 @@ class AuthnResponse(StatusResponse): self.timeslack) validate_before(condition.not_before, self.timeslack) except Exception, excp: - self.if log: self.log.error("Exception on condition: %s" % (excp,)) + if self.log: + self.log.error("Exception on condition: %s" % (excp,)) if not lax: raise else: diff --git a/src/saml2/server.py b/src/saml2/server.py index 4113fcc..ff03a69 100644 --- a/src/saml2/server.py +++ b/src/saml2/server.py @@ -293,9 +293,10 @@ class Server(object): try: consumer_url = self.metadata.consumer_url(sp_entity_id) except KeyError: - self.if log: self.log.info( + if self.log: + self.log.info( "Failed to find consumer URL for %s" % sp_entity_id) - self.if log: self.log.info( + if self.log: self.log.info( "entities: %s" % self.metadata.entity.keys()) raise UnknownPrincipal(sp_entity_id) @@ -603,7 +604,8 @@ class Server(object): self.log.info("binding wanted: %s" % (binding,)) raise - self.if log: self.log.info("Endpoint: %s" % slo) + if self.log: + self.log.info("Endpoint: %s" % slo) req = LogoutRequest(self.sec, slo) if binding == BINDING_SOAP: lreq = soap.parse_soap_enveloped_saml_logout_request(text) @@ -651,7 +653,8 @@ class Server(object): if not destination: - self.if log: self.log.error("Not way to return a response !!!") + if self.log: + self.log.error("Not way to return a response !!!") return ("412 Precondition Failed", [("Content-type", "text/html")], ["No return way defined"]) @@ -697,7 +700,8 @@ class Server(object): to_sign = [(class_name(response), mid)] response = signed_instance_factory(response, self.sec, to_sign) - self.if log: self.log.info("Response: %s" % (response,)) + if self.log: + self.log.info("Response: %s" % (response,)) if binding == BINDING_HTTP_REDIRECT: (headers, message) = http_redirect_message(response, destination, diff --git a/src/saml2/sigver.py b/src/saml2/sigver.py index 286cd23..831f52b 100644 --- a/src/saml2/sigver.py +++ b/src/saml2/sigver.py @@ -388,7 +388,8 @@ class SecurityContext(object): self.debug = 0 def correctly_signed(self, xml, must=False): - self.if log: self.log.info("verify correct signature") + if self.log: + self.log.info("verify correct signature") return self.correctly_signed_response(xml, must) def decrypt(self, enctext): @@ -397,7 +398,8 @@ class SecurityContext(object): :param enctext: The encrypted text as a string :return: The decrypted text """ - self.if log: self.log.info("input len: %d" % len(enctext)) + if self.log: + self.log.info("input len: %d" % len(enctext)) _, fil = make_temp("%s" % enctext, decode=False) ntf = NamedTemporaryFile() diff --git a/src/saml2/soap.py b/src/saml2/soap.py index 7782ea2..1a85e56 100644 --- a/src/saml2/soap.py +++ b/src/saml2/soap.py @@ -133,7 +133,8 @@ class SOAPClient(object): response = self.server.post(soap_message, {"content-type": "application/soap+xml"}) if response: - self.if log: self.log.info("SOAP response: %s" % response) + if self.log: + self.log.info("SOAP response: %s" % response) return parse_soap_enveloped_saml_response(response) else: return False diff --git a/src/saml2/virtual_org.py b/src/saml2/virtual_org.py index 0af07f8..2f9e876 100644 --- a/src/saml2/virtual_org.py +++ b/src/saml2/virtual_org.py @@ -41,8 +41,8 @@ class VirtualOrg(object): # Remove the ones I have cached data from about this subject vo_members = [m for m in vo_members if not self.sp.users.cache.active( subject_id, m)] - self.if log: self.log.info( - "VO members (not cached): %s" % vo_members) + if self.log: + self.log.info("VO members (not cached): %s" % vo_members) return vo_members def get_common_identifier(self, subject_id):