Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/pyff/samlmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ def parse(self, resource: Resource, content: str) -> EidasMDParserInfo:
fingerprints = list(certs.keys())
fp = None
if len(fingerprints) > 0:
fp = fingerprints[0]
fp = fingerprints

ep = ml.find("{{{}}}Endpoint".format(NS['ser']))
if ep is not None and fp is not None:
Expand Down
20 changes: 14 additions & 6 deletions src/pyff/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,15 +264,23 @@ def redis():


def check_signature(t: ElementTree, key: Optional[str], only_one_signature: bool = False) -> ElementTree:
refs = None
if key is not None:
log.debug(f"verifying signature using {key}")
refs = xmlsec.verified(t, key, drop_signature=True)
if only_one_signature and len(refs) != 1:
raise MetadataException("XML metadata contains %d signatures - exactly 1 is required" % len(refs))
t = refs[0] # prevent wrapping attacks
for k in key:
log.debug(f"verifying signature using {k}")
try:
refs = xmlsec.verified(t, k, drop_signature=True)
except xmlsec.exceptions.XMLSigException:
continue
if refs:
if only_one_signature and len(refs) != 1:
raise MetadataException("XML metadata contains %d signatures - exactly 1 is required" % len(refs))
t = refs[0] # prevent wrapping attacks
return t

return t
raise MetadataException("No valid signature(s) found")

return t

def validate_document(t):
schema().assertValid(t)
Expand Down
Loading