X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Flist.py;h=a1397040c1fc1bc9b819e3ff2eaf05ac5665454a;hb=c80f5f4e70735193224a009df3bf63a5fe56b95b;hp=5ca15aac4f0d6b5909e9c74cc61109e3a504b2ba;hpb=a57602691559f9591877edeaebe512c7a5651fcf;p=sfa.git

diff --git a/sfa/methods/list.py b/sfa/methods/list.py
index 5ca15aac..a1397040 100644
--- a/sfa/methods/list.py
+++ b/sfa/methods/list.py
@@ -6,6 +6,7 @@ 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
@@ -22,19 +23,21 @@ class list(Method):
     
     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, caller_cred=None):
-
+    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 caller_cred==None:
-	   caller_cred=cred
+        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, Credential(string=caller_cred).get_gid_caller().get_hrn(), hrn, self.name))
+        #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
@@ -52,20 +55,25 @@ class list(Method):
         # if the best match (longest matching hrn) is not the local registry,
         # forward the request
         if registry_hrn != self.api.hrn:
-	    credential = self.api.getCredential()
+            credential = self.api.getCredential()
             try:
-                record_list = registries[registry_hrn].list(credential, hrn, caller_cred=caller_cred)
-                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, origin_hrn)
+                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