X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Flist.py;h=24c4064d4dad6543c93b15f6980d0ad265f4d7fa;hb=d7d3f34ea227818f46ba16ee46c057ddebabdcb5;hp=b5e9b34cb9e605ff35a1a84e5ddc549a32925872;hpb=f13173726f8382eef380f1e754f24dd2b126a77b;p=sfa.git

diff --git a/sfa/methods/list.py b/sfa/methods/list.py
index b5e9b34c..24c4064d 100644
--- a/sfa/methods/list.py
+++ b/sfa/methods/list.py
@@ -4,10 +4,12 @@
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+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,34 +19,57 @@ 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, caller_cred=None):
+        self.api.auth.authenticateCred(cred, [cred, hrn], request_hash)
         self.api.auth.check(cred, 'list')
+        if caller_cred==None:
+            caller_cred=cred
+
+        #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))
         records = []
-        try:
-            if not self.api.auth.hierarchy.auth_exists(hrn):
-                raise MissingAuthority(hrn)
-            table = self.api.auth.get_auth_table(hrn)   
-            records = table.list()
-        except MissingAuthority:
-            # is this a foreign authority
-            registries = Registries(self.api)
+
+        # load all know registry names into a prefix tree and attempt to find
+        # the longest matching prefix  
+        registries = Registries(self.api)
+        hrns = registries.keys()
+        tree = prefixTree()
+        tree.load(hrns)
+        registry_hrn = tree.best_match(hrn)
+
+        #if there was no match then this record belongs to an unknow registry
+        if not registry_hrn:
+            raise MissingAuthority(hrn)
+        
+        # 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()
-            for registry in registries:
-                if hrn.startswith(registry) and registry not in [self.api.hrn]:
-                    record_list = registries[registry].list(credential, hrn)
-                    for record in record_list:
-                        records.append(record.as_dict()) 
+	    request_hash=None
+            try:
+                record_list = registries[registry_hrn].list(credential, hrn, request_hash, caller_cred)
+                records = [GeniRecord(dict=record).as_dict() for record in record_list]
+                if records:
                     return records
+            except:
+                pass
+
+        # 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 = GeniTable()
+        records = table.find({'authority': hrn})
         
         return records