Metadata Parse error Exception handling

Author: peppelinux

src/saml2/mdstore.py

@@ -15,6 +15,7 @@
 import requests
 import six
 
+from xml.etree.ElementTree import ParseError
 from saml2 import md
 from saml2 import saml
 from saml2 import samlp
@@ -612,8 +613,12 @@ def do_entity_descriptor(self, entity_descr):
             self.entity[entity_descr.entity_id] = _ent
 
     def parse(self, xmlstr):
-        self.entities_descr = md.entities_descriptor_from_string(xmlstr)
-
+        try:
+            self.entities_descr = md.entities_descriptor_from_string(xmlstr)
+        except Exception as e:
+            logger.error(f'Metadata Parse Error on: {self.filename}')
+            return
+        
         if not self.entities_descr:
             self.entity_descr = md.entity_descriptor_from_string(xmlstr)
             if self.entity_descr:

src/saml2/sigver.py

@@ -832,7 +832,7 @@ def sign_statement(self, statement, node_name, key_file, node_id):
             '--privkey-pem', key_file,
             '--id-attr:ID', node_name,
         ]
-
+        
         if node_id:
             com_list.extend(['--node-id', node_id])
 
@@ -952,7 +952,6 @@ def sign_statement(self, statement, node_name, key_file, node_id):
         """
         import xmlsec
         import lxml.etree
-
         xml = xmlsec.parse_xml(statement)
         signed = xmlsec.sign(xml, key_file)
         signed_str = lxml.etree.tostring(signed, xml_declaration=False, encoding="UTF-8")