Merge pull request #78 from mikkokeskinen/fix_metadata_signature_position

Fix signature tag position in the SP metadata

Author: pitbulk

src/onelogin/saml2/utils.py

@@ -742,7 +742,7 @@ def add_sign(xml, key, cert, debug=False, sign_algorithm=OneLogin_Saml2_Constant
             issuer = issuer[0]
             issuer.addnext(signature)
         else:
-            elem[0].insert(0, signature)
+            elem.insert(0, signature)
 
         elem_id = elem.get('ID', None)
         if elem_id:

tests/src/OneLogin/saml2_tests/metadata_test.py

@@ -13,6 +13,7 @@
 from onelogin.saml2.metadata import OneLogin_Saml2_Metadata
 from onelogin.saml2.settings import OneLogin_Saml2_Settings
 from onelogin.saml2.constants import OneLogin_Saml2_Constants
+from onelogin.saml2.xml_utils import OneLogin_Saml2_XML
 
 
 class OneLogin_Saml2_Metadata_Test(unittest.TestCase):
@@ -248,6 +249,10 @@ def testSignMetadata(self):
         self.assertIn('<ds:Reference', signed_metadata_2)
         self.assertIn('<ds:KeyInfo>\n<ds:X509Data>\n<ds:X509Certificate>', signed_metadata_2)
 
+        root = OneLogin_Saml2_XML.to_etree(signed_metadata_2)
+        first_child = OneLogin_Saml2_XML.query(root, '/md:EntityDescriptor/*[1]')[0]
+        self.assertEqual('{http://www.w3.org/2000/09/xmldsig#}Signature', first_child.tag)
+
     def testAddX509KeyDescriptors(self):
         """
         Tests the addX509KeyDescriptors method of the OneLogin_Saml2_Metadata

tests/src/OneLogin/saml2_tests/utils_test.py

@@ -774,7 +774,7 @@ def testAddSign(self):
         xml_metadata_signed = compat.to_string(OneLogin_Saml2_Utils.add_sign(xml_metadata, key, cert))
         self.assertIn('<ds:SignatureValue>', xml_metadata_signed)
         res_8 = parseString(xml_metadata_signed)
-        ds_signature_8 = res_8.firstChild.firstChild.nextSibling.firstChild.nextSibling
+        ds_signature_8 = res_8.firstChild.firstChild.nextSibling
         self.assertIn('ds:Signature', ds_signature_8.tagName)
 
     def testAddSignCheckAlg(self):