Fixing str vs. bytes py3 issues in client tests

Various things now return bytes or require bytes. This fixes some of the
test failures in python3 for test_51_client.

Author: SpamapS

src/saml2/__init__.py

@@ -616,7 +616,7 @@ def get_xml_string_with_self_contained_assertion_within_encrypted_assertion(self
 
         self.set_prefixes(tree.find(self.encrypted_assertion._to_element_tree().tag).find(assertion_tag), prefix_map)
 
-        return ElementTree.tostring(tree, encoding="UTF-8")
+        return ElementTree.tostring(tree, encoding="UTF-8").decode('utf-8')
 
     def set_prefixes(self, elem, prefix_map):
 

src/saml2/sigver.py

@@ -313,15 +313,15 @@ def signed_instance_factory(instance, seccont, elements_to_sign=None):
     :return: A class instance if not signed otherwise a string
     """
     if elements_to_sign:
-        signed_xml = str(instance).encode('utf-8')
+        signed_xml = str(instance)
         for (node_name, nodeid) in elements_to_sign:
             signed_xml = seccont.sign_statement(
                 signed_xml, node_name=node_name, node_id=nodeid)
 
         #print("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")
         #print("%s" % signed_xml)
         #print("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")
-        return signed_xml.decode('utf-8')
+        return signed_xml
     else:
         return instance
 
@@ -809,7 +809,7 @@ def encrypt_assertion(self, statement, enc_key, template,
         if not output:
             raise EncryptError(_stderr)
 
-        return output
+        return output.decode('utf-8')
 
     def decrypt(self, enctext, key_file):
         """
@@ -861,7 +861,7 @@ def sign_statement(self, statement, node_name, key_file, node_id,
             # this doesn't work if --store-signatures are used
             if stdout == "":
                 if signed_statement:
-                    return signed_statement
+                    return signed_statement.decode('utf-8')
             logger.error(
                 "Signing operation failed :\nstdout : %s\nstderr : %s" % (
                     stdout, stderr))
@@ -1336,7 +1336,9 @@ def decrypt_keys(self, enctext, keys=None):
             return _enctext
         for _key in keys:
             if _key is not None and len(_key.strip()) > 0:
-                _, key_file = make_temp("%s" % _key, decode=False)
+                if not isinstance(_key, six.binary_type):
+                    _key = str(_key).encode('ascii')
+                _, key_file = make_temp(_key, decode=False)
                 _enctext = self.crypto.decrypt(enctext, key_file)
                 if _enctext is not None and len(_enctext) > 0:
                     return _enctext

tests/test_51_client.py

@@ -160,7 +160,7 @@ def test_create_attribute_query1(self):
             "E8042FB4-4D5B-48C3-8E14-8EDD852790DD",
             format=saml.NAMEID_FORMAT_PERSISTENT,
             message_id="id1")
-        reqstr = "%s" % req.to_string()
+        reqstr = "%s" % req.to_string().decode('utf-8')
 
         assert req.destination == "https://idp.example.com/idp/"
         assert req.id == "id1"
@@ -335,7 +335,7 @@ def test_response_1(self):
 
         resp_str = "%s" % resp
 
-        resp_str = base64.encodestring(resp_str)
+        resp_str = base64.encodestring(resp_str.encode('utf-8'))
 
         authn_response = self.client.parse_authn_request_response(
             resp_str, BINDING_HTTP_POST,
@@ -377,7 +377,7 @@ def test_response_1(self):
             userid="[email protected]",
             authn=AUTHN)
 
-        resp_str = base64.encodestring(resp_str)
+        resp_str = base64.encodestring(resp_str.encode('utf-8'))
 
         self.client.parse_authn_request_response(
             resp_str, BINDING_HTTP_POST,
@@ -427,7 +427,7 @@ def test_response_2(self):
 
         resp_str = "%s" % resp
 
-        resp_str = base64.encodestring(resp_str)
+        resp_str = base64.encodestring(resp_str.encode('utf-8'))
 
         authn_response = _client.parse_authn_request_response(
             resp_str, BINDING_HTTP_POST,
@@ -462,7 +462,7 @@ def test_response_3(self):
 
         resp_str = "%s" % resp
 
-        resp_str = base64.encodestring(resp_str)
+        resp_str = base64.encodestring(resp_str.encode('utf-8'))
 
         authn_response = _client.parse_authn_request_response(
             resp_str, BINDING_HTTP_POST,
@@ -497,7 +497,7 @@ def test_response_4(self):
 
         resp_str = "%s" % resp
 
-        resp_str = base64.encodestring(resp_str)
+        resp_str = base64.encodestring(resp_str.encode('utf-8'))
 
         authn_response = _client.parse_authn_request_response(
             resp_str, BINDING_HTTP_POST,
@@ -541,7 +541,7 @@ def test_response_5(self):
 
         resp_str = "%s" % resp
 
-        resp_str = base64.encodestring(resp_str)
+        resp_str = base64.encodestring(resp_str.encode('utf-8'))
 
         authn_response = _client.parse_authn_request_response(
             resp_str, BINDING_HTTP_POST,
@@ -594,7 +594,7 @@ def test_response_6(self):
 
         resp_str = "%s" % resp
 
-        resp_str = base64.encodestring(resp_str)
+        resp_str = base64.encodestring(resp_str.encode('utf-8'))
 
         authn_response = _client.parse_authn_request_response(
             resp_str, BINDING_HTTP_POST,
@@ -629,7 +629,7 @@ def test_response_7(self):
 
         resp_str = "%s" % resp
 
-        resp_str = base64.encodestring(resp_str)
+        resp_str = base64.encodestring(resp_str.encode('utf-8'))
 
         authn_response = _client.parse_authn_request_response(
             resp_str, BINDING_HTTP_POST,
@@ -672,7 +672,7 @@ def test_response_8(self):
 
         resp_str = "%s" % resp
 
-        resp_str = base64.encodestring(resp_str)
+        resp_str = base64.encodestring(resp_str.encode('utf-8'))
 
         authn_response = _client.parse_authn_request_response(
             resp_str, BINDING_HTTP_POST,
@@ -904,7 +904,7 @@ def test_sign_then_encrypt_assertion_advice_1(self):
 
         #seresp = samlp.response_from_string(enctext)
 
-        resp_str = base64.encodestring(enctext)
+        resp_str = base64.encodestring(enctext.encode('utf-8'))
         # Now over to the client side
         resp = self.client.parse_authn_request_response(
             resp_str, BINDING_HTTP_POST,
@@ -1138,7 +1138,7 @@ def test_sign_then_encrypt_assertion_advice_2(self):
 
         #seresp = samlp.response_from_string(enctext)
 
-        resp_str = base64.encodestring("%s" % response)
+        resp_str = base64.encodestring(str(response).encode('utf-8'))
         # Now over to the client side
         resp = self.client.parse_authn_request_response(
             resp_str, BINDING_HTTP_POST,