again getting away with caller_cred and passing just the hrn of the initial caller

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

diff --git a/sfa/methods/resolve.py b/sfa/methods/resolve.py
index 0953f1c..4a5f560 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.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,14 +25,22 @@ 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, origin_hrn=None):
         
+        self.api.auth.authenticateCred(cred, [cred, hrn], request_hash) 
         self.api.auth.check(cred, 'resolve')
+        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))
         good_records = [] 
 
         # load all know registry names into a prefix tree and attempt to find
@@ -50,19 +60,21 @@ class resolve(Method):
         if registry_hrn != self.api.hrn:
             credential = self.api.getCredential()
             try:
-                records = registries[registry_hrn].resolve(credential, hrn)
-                good_records = [record.as_dict() for record in record_list]
-                if good_records:
-                    return good_records
+               request_hash=None
+                records = registries[registry_hrn].resolve(credential, hrn, request_hash, origin_hrn)
+                good_records = [GeniRecord(dict=record).as_dict() for record in records]
             except:
-                pass 
+                arg_list = [credential, hrn]
+                request_hash=self.api.key.compute_hash(arg_list)                
+                records = registries[registry_hrn].resolve(credential, hrn, request_hash, origin_hrn)
+                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
-        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)
+        table = GeniTable()
+        records = table.findObjects(hrn)
         if not records:
             raise RecordNotFound(hrn) 
         for record in records:
@@ -70,9 +82,8 @@ class resolve(Method):
                 self.api.fill_record_info(record)
                 good_records.append(dict(record))
             except PlanetLabRecordDoesNotExist:
-                raise
                 # silently drop the ones that are missing in PL
-                print >> log, "ignoring geni record ", record.get_name(), \
+                print >> log, "ignoring geni record ", record['hrn'], \
                               " because pl record does not exist"
                 table.remove(record)