Merge pull request #697 from ottonomy/bugfix/693-py3-make_metadata-accept-str

Allow generation of signed metadata in python3

Author: c00kiemon5ter

src/saml2/metadata.py

@@ -66,10 +66,10 @@ def metadata_tostring_fix(desc, nspair, xmlstring=""):
     if not xmlstring:
         xmlstring = desc.to_string(nspair)
 
-    if six.PY2:
+    try:
         if "\"xs:string\"" in xmlstring and XMLNSXS not in xmlstring:
             xmlstring = xmlstring.replace(MDNS, MDNS + XMLNSXS)
-    else:
+    except TypeError:
         if b"\"xs:string\"" in xmlstring and bXMLNSXS not in xmlstring:
             xmlstring = xmlstring.replace(bMDNS, bMDNS + bXMLNSXS)
 

tests/test_39_metadata.py

@@ -1,7 +1,10 @@
 import copy
 from saml2.config import SPConfig
-from saml2.metadata import entity_descriptor
+from saml2.metadata import create_metadata_string, entity_descriptor
 from saml2.saml import NAME_FORMAT_URI, NAME_FORMAT_BASIC
+from saml2 import sigver
+
+from pathutils import full_path
 
 __author__ = 'roland'
 
@@ -47,5 +50,17 @@ def test_requested_attribute_name_format():
         assert req_attr.name_format == NAME_FORMAT_BASIC
 
 
+def test_signed_metadata_proper_str_bytes_handling():
+    sp_conf_2 = sp_conf.copy()
+    sp_conf_2['key_file'] = full_path("test.key")
+    sp_conf_2['cert_file'] = full_path("inc-md-cert.pem")
+    # requires xmlsec binaries per https://pysaml2.readthedocs.io/en/latest/examples/sp.html
+    sp_conf_2['xmlsec_binary'] = sigver.get_xmlsec_binary(["/opt/local/bin"])
+    cnf = SPConfig().load(sp_conf_2, metadata_construction=True)
+
+    # This will raise TypeError if string/bytes handling is not correct
+    sp_metadata = create_metadata_string('', config=cnf, sign=True)
+
+
 if __name__ == '__main__':
-    test_requested_attribute_name_format()
+    test_requested_attribute_name_format()