request hash is optional

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

diff --git a/sfa/methods/resolve.py b/sfa/methods/resolve.py
index f9d3223..29e79b4 100644 (file)
--- a/sfa/methods/resolve.py
+++ b/sfa/methods/resolve.py
@@ -1,14 +1,16 @@
 ### $Id$
 ### $URL$
-
+import traceback
 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.util.debug import log
-
 from sfa.server.registry import Registries
+from sfa.util.prefixTree import prefixTree
+from sfa.trust.credential import Credential
 
 class resolve(Method):
     """
@@ -23,42 +25,67 @@ class resolve(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):
+    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, 'resolve')
+        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))
         good_records = [] 
-        try:
-            auth_hrn = self.api.auth.get_authority(hrn)
-            if not auth_hrn:
-                auth_hrn = hrn
-            table = self.api.auth.get_auth_table(auth_hrn)
-            records = table.resolve('*', hrn)
-            if not records:
-                raise RecordNotFound(hrn) 
-            good_records = []
-            for record in records:
-                try:
-                    self.api.fill_record_info(record)
-                    good_records.append(record)
-                except PlanetLabRecordDoesNotExist:
-                    # silently drop the ones that are missing in PL
-                    print >> log, "ignoring geni record ", record.get_name(), \
-                              " because pl record does not exist"
-                    table.remove(record)
-        except:
-            # is this a foreign record
-            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 not registry in [self.api.hrn]:
-                    records = registries[registry].resolve(credential, hrn)
-                    good_records = records
-        dicts = [record.as_dict() for record in good_records]
+            try:
+                records = registries[registry_hrn].resolve(credential, hrn, caller_cred)
+                good_records = [GeniRecord(dict=record).as_dict() for record in records]
+            except:
+                arg_list = [credential, hrn]
+                request_hash=self.api.key.compute_hash(arg_list)                
+                records = registries[registry_hrn].resolve(credential, hrn, request_hash, caller_cred)
+                good_records = [GeniRecord(dict=record).as_dict() for record in records]
+                
+        if good_records:
+            return good_records
+
+        # if we still havnt found the record yet, try the local registry
+        table = GeniTable()
+        records = table.findObjects(hrn)
+        if not records:
+            raise RecordNotFound(hrn) 
+        for record in records:
+            try:
+                self.api.fill_record_info(record)
+                good_records.append(dict(record))
+            except PlanetLabRecordDoesNotExist:
+                # silently drop the ones that are missing in PL
+                print >> log, "ignoring geni record ", record['hrn'], \
+                              " because pl record does not exist"
+                table.remove(record)
+
 
-        return dicts    
+        return good_records