Merge branch 'master' of https://github.com/coolbootscoder/python-saml into coolbootscoder-master

Author: pitbulk

src/onelogin/saml2/auth.py

@@ -14,14 +14,14 @@
 from base64 import b64encode
 from urllib import quote_plus
 
-import dm.xmlsec.binding as xmlsec
+# import dm.xmlsec.binding as xmlsec
 
 from onelogin.saml2.settings import OneLogin_Saml2_Settings
 from onelogin.saml2.response import OneLogin_Saml2_Response
 from onelogin.saml2.errors import OneLogin_Saml2_Error
 from onelogin.saml2.logout_response import OneLogin_Saml2_Logout_Response
 from onelogin.saml2.constants import OneLogin_Saml2_Constants
-from onelogin.saml2.utils import OneLogin_Saml2_Utils
+from onelogin.saml2.utils import OneLogin_Saml2_Utils, xmlsec
 from onelogin.saml2.logout_request import OneLogin_Saml2_Logout_Request
 from onelogin.saml2.authn_request import OneLogin_Saml2_Authn_Request
 
@@ -433,7 +433,7 @@ def __build_signature(self, saml_data, relay_state, saml_type, sign_algorithm=On
                 OneLogin_Saml2_Error.SP_CERTS_NOT_FOUND
             )
 
-        xmlsec.initialize()
+        # xmlsec.initialize() # already done in utils module
 
         dsig_ctx = xmlsec.DSigCtx()
         dsig_ctx.signKey = xmlsec.Key.loadMemory(key, xmlsec.KeyDataFormatPem, None)

src/onelogin/saml2/utils.py

@@ -34,6 +34,10 @@
 from onelogin.saml2.constants import OneLogin_Saml2_Constants
 from onelogin.saml2.errors import OneLogin_Saml2_Error
 
+if not globals().get('xmlsec_setup', False):
+    xmlsec.initialize()
+    globals()['xmlsec_setup'] = True
+
 
 def print_xmlsec_errors(filename, line, func, error_object, error_subject, reason, msg):
     """
@@ -626,7 +630,7 @@ def generate_name_id(value, sp_nq, sp_format, cert=None, debug=False, nq=None):
             xml = name_id_container.toxml()
             elem = fromstring(xml)
 
-            xmlsec.initialize()
+            # xmlsec.initialize('openssl') # done when the module is loaded
 
             if debug:
                 xmlsec.set_error_callback(print_xmlsec_errors)
@@ -735,7 +739,7 @@ def decrypt_element(encrypted_data, key, debug=False):
         elif isinstance(encrypted_data, basestring):
             encrypted_data = fromstring(str(encrypted_data))
 
-        xmlsec.initialize()
+        # xmlsec.initialize()  # Initialized at the start of the module
 
         if debug:
             xmlsec.set_error_callback(print_xmlsec_errors)
@@ -810,7 +814,7 @@ def add_sign(xml, key, cert, debug=False, sign_algorithm=OneLogin_Saml2_Constant
         else:
             raise Exception('Error parsing xml string')
 
-        xmlsec.initialize()
+        # xmlsec.initialize()  # Initialized at the start of the module
 
         if debug:
             xmlsec.set_error_callback(print_xmlsec_errors)
@@ -916,7 +920,7 @@ def validate_sign(xml, cert=None, fingerprint=None, fingerprintalg='sha1', valid
             else:
                 raise Exception('Error parsing xml string')
 
-            xmlsec.initialize()
+            # xmlsec.initialize()  # Initialized at the start of the module
 
             if debug:
                 xmlsec.set_error_callback(print_xmlsec_errors)
@@ -981,7 +985,7 @@ def validate_metadata_sign(xml, cert=None, fingerprint=None, fingerprintalg='sha
             else:
                 raise Exception('Error parsing xml string')
 
-            xmlsec.initialize()
+            # xmlsec.initialize()  # Initialized at the start of the module
 
             if debug:
                 xmlsec.set_error_callback(print_xmlsec_errors)
@@ -1034,7 +1038,7 @@ def validate_node_sign(signature_node, elem, cert=None, fingerprint=None, finger
         :type: bool
         """
         try:
-            xmlsec.initialize()
+            # xmlsec.initialize()  # Initialized at the start of the module
 
             if debug:
                 xmlsec.set_error_callback(print_xmlsec_errors)
@@ -1099,7 +1103,7 @@ def validate_binary_sign(signed_query, signature, cert=None, algorithm=OneLogin_
         :type: bool
         """
         try:
-            xmlsec.initialize()
+            # xmlsec.initialize()  # Initialized at the start of the module
 
             if debug:
                 xmlsec.set_error_callback(print_xmlsec_errors)