we were passing the original caller credential accross aggregates for call tracabilit...

[sfa.git] / sfa / methods / list.py

diff --git a/sfa/methods/list.py b/sfa/methods/list.py
index e9be62e..90a7b8b 100644 (file)
--- a/sfa/methods/list.py
+++ b/sfa/methods/list.py
@@ -6,8 +6,10 @@ from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
 from sfa.trust.auth import Auth
 from sfa.util.record import GeniRecord
+from sfa.util.genitable import GeniTable
 from sfa.server.registry import Registries
 from sfa.util.prefixTree import prefixTree
+from sfa.trust.credential import Credential
 
 class list(Method):
     """
@@ -17,19 +19,25 @@ class list(Method):
     @param hrn human readable name of authority to list
     @return list of record dictionaries         
     """
-
     interfaces = ['registry']
     
     accepts = [
         Parameter(str, "Credential string"),
-        Parameter(str, "Human readable name (hrn)")
+        Parameter(str, "Human readable name (hrn)"),
+        Mixed(Parameter(str, "Request hash"),
+              Parameter(None, "Request hash not specified"))
         ]
 
     returns = [GeniRecord]
     
-    def call(self, cred, hrn):
-        
+    def call(self, cred, hrn, request_hash=None, origin_hrn=None):
+        self.api.auth.authenticateCred(cred, [cred, hrn], request_hash)
         self.api.auth.check(cred, 'list')
+        if origin_hrn==None:
+            origin_hrn=Credential(string=cred).get_gid_caller().get_hrn()
+
+        #log the call
+        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
         records = []
 
         # load all know registry names into a prefix tree and attempt to find
@@ -49,18 +57,23 @@ class list(Method):
         if registry_hrn != self.api.hrn:
             credential = self.api.getCredential()
             try:
-                record_list = registries[registry_hrn].list(credential, hrn)
-                records = [record.as_dict() for record in record_list]
-                if records:
-                    return records
+               request_hash=None
+                record_list = registries[registry_hrn].list(credential, hrn, request_hash, caller_cred)
+                records = [GeniRecord(dict=record).as_dict() for record in record_list]
             except:
-                pass
+                arg_list = [credential, hrn]
+                request_hash = self.api.key.compute_hash(arg_list)
+                record_list = registries[registry_hrn].list(credential, hrn, request_hash, origin_hrn)
+                records = [GeniRecord(dict=record).as_dict() for record in record_list] 
+                
+        if records:
+            return records
 
         # if we still havnt found the record yet, try the local registry
         if not self.api.auth.hierarchy.auth_exists(hrn):
             raise MissingAuthority(hrn)
         
-        table = self.api.auth.get_auth_table(hrn)
-        records = table.list()
-          
+        table = GeniTable()
+        records = table.find({'authority': hrn})
+        
         return records