Deal with stricter bytes/strings in py3

Several more instances of test failures in python3 caused by
incompatible use of bytes vs. strings. Notable difference from other
similar patches is that ascii can be used for encoding certificate
strings since they are base64 encoded.

Author: SpamapS

src/saml2/__init__.py

@@ -602,7 +602,7 @@ def get_xml_string_with_self_contained_assertion_within_advice_encrypted_asserti
                     if assertion is not None:
                         self.set_prefixes(assertion, prefix_map)
 
-        return ElementTree.tostring(tree, encoding="UTF-8")
+        return ElementTree.tostring(tree, encoding="UTF-8").decode('utf-8')
 
     def get_xml_string_with_self_contained_assertion_within_encrypted_assertion(self, assertion_tag):
         """ Makes a encrypted assertion only containing self contained namespaces.

src/saml2/entity.py

@@ -540,7 +540,7 @@ def _encrypt_assertion(self, encrypt_cert, sp_entity_id, response, node_xpath=No
                     _cert = "%s%s" % (begin_cert, _cert)
                 if end_cert not in _cert:
                     _cert = "%s%s" % (_cert, end_cert)
-                _, cert_file = make_temp(_cert, decode=False)
+                _, cert_file = make_temp(_cert.encode('ascii'), decode=False)
                 response = cbxs.encrypt_assertion(response, cert_file,
                                                   pre_encryption_part(), node_xpath=node_xpath)
                 return response

src/saml2/s_utils.py

@@ -152,6 +152,8 @@ def deflate_and_base64_encode(string_val):
     :param string_val: The string to deflate and encode
     :return: The deflated and encoded string
     """
+    if not isinstance(string_val, six.binary_type):
+        string_val = string_val.encode('utf-8')
     return base64.b64encode(zlib.compress(string_val)[2:-4])
 
 

src/saml2/sigver.py

@@ -321,7 +321,7 @@ def signed_instance_factory(instance, seccont, elements_to_sign=None):
         #print("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")
         #print("%s" % signed_xml)
         #print("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")
-        return signed_xml
+        return signed_xml.decode('utf-8')
     else:
         return instance
 

tests/test_50_server.py

@@ -560,7 +560,7 @@ def test_encrypted_signed_response_1(self):
 
         assert valid
 
-        _, key_file = make_temp("%s" % cert_key_str, decode=False)
+        _, key_file = make_temp(str(cert_key_str).encode('ascii'), decode=False)
 
         decr_text = self.server.sec.decrypt(signed_resp, key_file)
 
@@ -644,7 +644,7 @@ def test_encrypted_signed_response_3(self):
                                                  id_attr="")
         assert valid
 
-        _, key_file = make_temp("%s" % cert_key_str, decode=False)
+        _, key_file = make_temp(str(cert_key_str).encode('ascii'), decode=False)
 
         decr_text = self.server.sec.decrypt(signed_resp, key_file)
 
@@ -1138,7 +1138,7 @@ def test_slo_http_post(self):
             issuer_entity_id="urn:mace:example.com:saml:roland:idp",
             reason="I'm tired of this")
 
-        intermed = base64.b64encode("%s" % logout_request)
+        intermed = base64.b64encode(str(logout_request).encode('utf-8'))
 
         #saml_soap = make_soap_enveloped_saml_thingy(logout_request)
         request = self.server.parse_logout_request(intermed, BINDING_HTTP_POST)