openstack/deb-python-pysaml2
Code Issues Proposed changes

Fix for encrypted assertion.

Browse Source
This commit is contained in:
Hans Hörberg
2014-05-05 16:02:55 +02:00
parent f6572e156d
commit ab301ad938
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/saml2/response.py
View File

@@ -809,7 +809,7 @@ class AuthnResponse(StatusResponse):
if self.response.encrypted_assertion:
logger.debug("***Encrypted assertion/-s***")
decr_text = self.sec.decrypt(self.xmlstr)
decr_text = self.sec.decrypt(self.xmlstr, key_file)
resp = samlp.response_from_string(decr_text)
res = self.decrypt_assertions(resp.encrypted_assertion, key_file)
if self.response.assertion:

4
src/saml2/sigver.py
View File

@@ -1250,12 +1250,14 @@ class SecurityContext(object):
:return:
"""
def decrypt(self, enctext):
def decrypt(self, enctext, key_file=None):
""" Decrypting an encrypted text by the use of a private key.
:param enctext: The encrypted text as a string
:return: The decrypted text
"""
if key_file is not None and len(key_file.strip()) > 0:
return self.crypto.decrypt(enctext, key_file)
return self.crypto.decrypt(enctext, self.key_file)
def verify_signature(self, signedtext, cert_file=None, cert_type="pem",