add md sources info to discojson

Author: enriquepablo

src/pyff/builtins.py

@@ -977,7 +977,7 @@ def _discojson(req: Plumbing.Request, *opts):
     if req.t is None:
         raise PipeException("Your pipeline is missing a select statement.")
 
-    res = discojson_t(req.t, icon_store=req.md.icon_store)
+    res = discojson_t(req.t, req.md.rm, icon_store=req.md.icon_store)
     res.sort(key=operator.itemgetter('title'))
 
     return json.dumps(res)

src/pyff/resource.py

@@ -7,7 +7,7 @@
 
 import os
 import traceback
-from collections import deque
+from collections import deque, defaultdict
 from datetime import datetime
 from enum import Enum
 from threading import Condition, Lock
@@ -239,6 +239,7 @@ def __init__(self, url: Optional[str], opts: ResourceOpts):
         self.last_parser: Optional['PyffParser'] = None  # importing PyffParser in this module causes a loop
         self._infos: Deque[ResourceInfo] = deque(maxlen=config.info_buffer_size)
         self.children: Deque[Resource] = deque()
+        self.md_sources: Optional[dict] = None
         self._setup()
 
     def _setup(self):
@@ -491,3 +492,15 @@ def parse(self, getter: Callable[[str], Response]) -> Deque[Resource]:
         info.state = ResourceLoadState.Ready
 
         return self.children
+
+    def global_md_sources(self):
+        from pyff.samlmd import SAMLParserInfo
+
+        md_sources = defaultdict(list)
+        for r in self.walk():
+            if r.url:
+                for info in r._infos:
+                    if isinstance(info.parser_info, SAMLParserInfo):
+                        for entity_id in info.parser_info.entities:
+                            md_sources[entity_id].append(r.url)
+        return md_sources

src/pyff/samlmd.py

@@ -793,7 +793,7 @@ def entity_scopes(e):
     return [s.text for s in elt]
 
 
-def discojson(e, langs=None, fallback_to_favicon=False, icon_store=None):
+def discojson(e, sources=None, langs=None, fallback_to_favicon=False, icon_store=None):
     if e is None:
         return dict()
 
@@ -819,6 +819,9 @@ def discojson(e, langs=None, fallback_to_favicon=False, icon_store=None):
     if cats is not None:
         d['entity_categories'] = cats
 
+    if sources is not None:
+        d['md_sources'] = sources
+
     eattr = entity_attribute_dict(e)
     if 'idp' in eattr[ATTRS['role']]:
         d['type'] = 'idp'
@@ -858,8 +861,15 @@ def discojson(e, langs=None, fallback_to_favicon=False, icon_store=None):
     return d
 
 
-def discojson_t(t, icon_store=None):
-    return [discojson(en, icon_store=icon_store) for en in iter_entities(t)]
+def discojson_t(t, resource, icon_store=None):
+    md_sources = resource.global_md_sources()
+    entities = []
+    for en in iter_entities(t):
+        entity_id = en.attrib['entityID']
+        sources = md_sources[entity_id]
+        entity = discojson(en, sources=sources, icon_store=icon_store)
+        entities.append(entity)
+    return entities
 
 
 def fetch_mdjson(urls):
@@ -884,7 +894,7 @@ def fetch_mdjson(urls):
 
     ot = entitiesdescriptor(entities, 'extra-sources')
 
-    entities_json_list = discojson_t(ot)
+    entities_json_list = discojson_t(ot, resource)
 
     entities_json = {}
     for e in entities_json_list: