Fix 60. lxml ValueError exception

pitbulk · pitbulk · commit 8365e91b55d6 · 2017-11-03T21:28:17.000+01:00
diff --git a/src/onelogin/saml2/idp_metadata_parser.py b/src/onelogin/saml2/idp_metadata_parser.py
@@ -16,6 +16,7 @@
 
 import ssl
 
+from onelogin.saml2 import compat
 from onelogin.saml2.constants import OneLogin_Saml2_Constants
 from onelogin.saml2.xml_utils import OneLogin_Saml2_XML
 
@@ -51,7 +52,7 @@ def get_metadata(url, validate_cert=True):
 
         if xml:
             try:
-                dom = OneLogin_Saml2_XML.to_etree(xml)
+                dom = OneLogin_Saml2_XML.to_etree(compat.to_bytes(xml))
                 idp_descriptor_nodes = OneLogin_Saml2_XML.query(dom, '//md:IDPSSODescriptor')
                 if idp_descriptor_nodes:
                     valid = True
@@ -124,7 +125,7 @@ def parse(
         """
         data = {}
 
-        dom = OneLogin_Saml2_XML.to_etree(idp_metadata)
+        dom = OneLogin_Saml2_XML.to_etree(compat.to_bytes(idp_metadata))
         idp_entity_id = want_authn_requests_signed = idp_name_id_format = idp_sso_url = idp_slo_url = certs = None
 
         entity_desc_path = '//md:EntityDescriptor'
diff --git a/src/onelogin/saml2/logout_response.py b/src/onelogin/saml2/logout_response.py
@@ -39,7 +39,7 @@ def __init__(self, settings, response=None):
 
         if response is not None:
             self.__logout_response = compat.to_string(OneLogin_Saml2_Utils.decode_base64_and_inflate(response))
-            self.document = OneLogin_Saml2_XML.to_etree(self.__logout_response)
+            self.document = OneLogin_Saml2_XML.to_etree(compat.to_bytes(self.__logout_response))
             self.id = self.document.get('ID', None)
 
     def get_issuer(self):
@@ -169,7 +169,7 @@ def build(self, in_response_to):
                 'status': "urn:oasis:names:tc:SAML:2.0:status:Success"
             }
 
-        self.__logout_response = logout_response
+        self.__logout_response = compat.to_string(logout_response)
 
     def get_response(self, deflate=True):
         """
