pick trust metadata from both xml & json

Author: enriquepablo

NEWS.txt

@@ -173,4 +173,8 @@ to sign using HSMs. The only mandatory non-python dependency now is lxml.
 
 2.1.3
 -----
+* Release date: ons  10 sep 2024 17:17:10 CET
+
 * Add DiscoveryResponse info to SPs in discojson
+* Remove cherrypy imports
+* Fix logging

src/pyff/samlmd.py

@@ -1032,20 +1032,6 @@ def discojson_sp(e, global_trust_info=None, global_md_sources=None):
     return sp
 
 
-def discojson_sp_t(req):
-    d = []
-    t = req.t
-    global_tinfo = req.md.rm.global_trust_info()
-    global_sources = req.md.rm.global_md_sources()
-
-    for e in iter_entities(t):
-        sp = discojson_sp(e, global_trust_info=global_tinfo, global_md_sources=global_sources)
-        if sp is not None:
-            d.append(sp)
-
-    return d
-
-
 def discojson_sp_attr(e):
 
     attribute = "http://refeds.org/entity-selection-profile"
@@ -1065,6 +1051,24 @@ def discojson_sp_attr(e):
     return sp
 
 
+def discojson_sp_t(req):
+    d = []
+    t = req.t
+    global_tinfo = req.md.rm.global_trust_info()
+    global_sources = req.md.rm.global_md_sources()
+
+    for e in iter_entities(t):
+        sp = discojson_sp(e, global_trust_info=global_tinfo, global_md_sources=global_sources)
+        if sp is not None:
+            d.append(sp)
+
+        sp = discojson_sp_attr(e)
+        if sp is not None:
+            d.append(sp)
+
+    return d
+
+
 def discojson_sp_attr_t(req):
     d = []
     t = req.t

src/pyff/test/data/metadata/test02-sp.xml

@@ -25,6 +25,9 @@
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
         <saml:AttributeValue>https://refeds.org/category/code-of-conduct/v2</saml:AttributeValue>
       </saml:Attribute>
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://refeds.org/entity-selection-profile">   
+        <saml:AttributeValue>ewogICJwcm9maWxlcyI6IHsKICAgICJpbmNvbW1vbi13YXlmaW5kZXIiOiB7CiAgICAgICAic3RyaWN0IjogdHJ1ZSwKICAgICAgICJlbnRpdGllcyI6IFsKICAgICAgICAgewogICAgICAgICAgICJzZWxlY3QiOiAiaHR0cHM6Ly9tZHEuaW5jb21tb24ub3JnL2VudGl0aWVzIiwKICAgICAgICAgICAibWF0Y2giOiAibWRfc291cmNlIiwKICAgICAgICAgICAiaW5jbHVkZSI6IHRydWUKICAgICAgICAgfQogICAgICAgXQogICAgfQogIH0KfQ==</saml:AttributeValue>
+      </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">

src/pyff/test/test_pipeline.py

@@ -747,12 +747,19 @@ def test_discojson_sp(self):
                     sp_json = json.load(f)
 
                 assert 'https://example.com.com/shibboleth' in str(sp_json)
+                assert len(sp_json) == 2
                 example_sp_json = sp_json[0]
                 assert 'customer' in example_sp_json['profiles']
                 customer_tinfo = example_sp_json['profiles']['customer']
                 assert customer_tinfo['entity'][0] == {'entity_id': 'https://example.org/idp.xml', 'include': True}
                 assert customer_tinfo['entities'][0] == {'select': 'http://www.swamid.se/', 'match': 'registrationAuthority', 'include': True}
                 assert customer_tinfo['fallback_handler'] == {'profile': 'href', 'handler': 'https://www.example.org/about'}
+
+                example_sp_json_2 = sp_json[1]
+                assert 'incommon-wayfinder' in example_sp_json_2['profiles']
+                tinfo = example_sp_json_2['profiles']['incommon-wayfinder']
+                assert tinfo['entities'][0] == {'select': 'https://mdq.incommon.org/entities', 'match': 'md_source', 'include': True}
+                assert tinfo['strict']
             except IOError:
                 pass
             finally: