X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fresolve.py;h=c1d87143974e70ccf755c306cf01aa9a6a7160fa;hb=c451060afdf4ef60cdfea767ba6f00d6ffce66f8;hp=6e6f7b681e09ed611ef06b8dfd2d6289343cc1e9;hpb=1971124b0a49cfbd7bce902722a1512baf8562f3;p=sfa.git

diff --git a/sfa/methods/resolve.py b/sfa/methods/resolve.py
index 6e6f7b68..c1d87143 100644
--- a/sfa/methods/resolve.py
+++ b/sfa/methods/resolve.py
@@ -10,6 +10,7 @@ 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):
     """
@@ -24,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, 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 = [] 
 
         # load all know registry names into a prefix tree and attempt to find
@@ -51,7 +60,7 @@ class resolve(Method):
         if registry_hrn != self.api.hrn:
             credential = self.api.getCredential()
             try:
-                records = registries[registry_hrn].resolve(credential, hrn)
+                records = registries[registry_hrn].resolve(credential, hrn, caller_cred=caller_cred)
                 good_records = [record.as_dict() for record in records]
                 if good_records:
                     return good_records
@@ -60,7 +69,7 @@ class resolve(Method):
 
         # if we still havnt found the record yet, try the local registry
         table = GeniTable()
-        records = table.find(hrn)
+        records = table.findObjects(hrn)
         if not records:
             raise RecordNotFound(hrn) 
         for record in records:
@@ -69,7 +78,7 @@ class resolve(Method):
                 good_records.append(dict(record))
             except PlanetLabRecordDoesNotExist:
                 # 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)