From: Tony Mack <tmack@cs.princeton.edu>
Date: Thu, 31 Dec 2009 00:41:16 +0000 (+0000)
Subject: get caller's hrn from the credentials gid_origin_caller object
X-Git-Tag: sfa-0.9-7~53
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6987653677f806729ff39aefa77cc8d9ab3e2a52;p=sfa.git

get caller's hrn from the credentials gid_origin_caller object
---

diff --git a/sfa/methods/remove_peer_object.py b/sfa/methods/remove_peer_object.py
index 81a9e532..ab55ed87 100644
--- a/sfa/methods/remove_peer_object.py
+++ b/sfa/methods/remove_peer_object.py
@@ -33,11 +33,14 @@ class remove_peer_object(Method):
 
     returns = Parameter(int, "1 if successful")
     
-    def call(self, cred, record, request_hash=None, origin_hrn=None):
-        if origin_hrn==None:
-            origin_hrn=Credential(string=cred).get_gid_caller().get_hrn()
+    def call(self, cred, record, request_hash=None):
+        user_cred = Credential(string=cred)
+
         #log the call
-        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, record['hrn'], self.name))
+        gid_origin_caller = user_cred.get_gid_origin_caller()
+        origin_hrn = gid_origin_caller.get_hrn()
+        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
+
         self.api.auth.authenticateCred(cred, [cred], request_hash) 
         self.api.auth.check(cred, "remove")