openstack/deb-python-pysaml2
Code Issues Proposed changes

Applied proposal by jozef@github. Pull request 301.

Browse Source 
Fixed test error at the same time.
This commit is contained in:
Roland Hedberg
2016-01-12 11:56:12 +01:00
parent f60a5b318a
commit 62d12bd346
2 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/saml2/sigver.py
View File

@@ -1539,27 +1539,11 @@ class SecurityContext(object):
for _, pem_file in certs:
try:
last_pem_file = pem_file
if origdoc is not None:
try:
if self.verify_signature(origdoc, pem_file,
node_name=node_name,
node_id=item.id,
id_attr=id_attr):
verified = True
break
except Exception:
if self.verify_signature(decoded_xml, pem_file,
node_name=node_name,
node_id=item.id,
id_attr=id_attr):
verified = True
break
else:
if self.verify_signature(decoded_xml, pem_file,
node_name=node_name,
node_id=item.id, id_attr=id_attr):
verified = True
break
if self.verify_signature(decoded_xml, pem_file,
node_name=node_name,
node_id=item.id, id_attr=id_attr):
verified = True
break
except XmlsecError as exc:
logger.error("check_sig: %s", exc)
pass

2
tests/test_41_response.py
View File

@@ -16,7 +16,7 @@ from pathutils import full_path
FALSE_ASSERT_SIGNED = full_path("saml_false_signed.xml")
TIMESLACK = 40000000 # Roughly +- 24 month
TIMESLACK = 62000000 # Roughly +- 24 month
def _eq(l1, l2):