Merge pull request #553 from johanlundberg/non_ascii_ava_encryption_decryption

AuthnResponse should store member xmlstr in correct type

Author: c00kiemon5ter

src/saml2/response.py

@@ -319,7 +319,10 @@ def load_instance(self, instance):
     def _loads(self, xmldata, decode=True, origxml=None):
 
         # own copy
-        self.xmlstr = xmldata[:]
+        if isinstance(xmldata, six.binary_type):
+            self.xmlstr = xmldata[:].decode('utf-8')
+        else:
+            self.xmlstr = xmldata[:]
         logger.debug("xmlstr: %s", self.xmlstr)
         if origxml:
             self.origxml = origxml
@@ -1082,15 +1085,13 @@ def session_info(self):
                     "session_index": authn_statement.session_index}
 
     def __str__(self):
-        if isinstance(self.xmlstr, six.string_types):
-            return self.xmlstr
-        return str(self.xmlstr)
+        return self.xmlstr
 
     def verify_recipient(self, recipient):
         """
         Verify that I'm the recipient of the assertion
-        
-        :param recipient: A URI specifying the entity or location to which an 
+
+        :param recipient: A URI specifying the entity or location to which an
             attesting entity can present the assertion.
         :return: True/False
         """

tests/test_65_authn_query.py

@@ -65,11 +65,6 @@ def test_flow():
 
     with closing(Server(config_file="idp_all_conf")) as idp:
         relay_state = "FOO"
-        # -- dummy request ---
-        orig_req = AuthnRequest(
-            issuer=sp._issuer(),
-            name_id_policy=NameIDPolicy(allow_create="true",
-                                        format=NAMEID_FORMAT_TRANSIENT))
 
         # == Create an AuthnRequest response