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

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

diff --git a/sfa/methods/update.py b/sfa/methods/update.py
index 8c307e4..01ef639 100644 (file)
--- a/sfa/methods/update.py
+++ b/sfa/methods/update.py
@@ -1,6 +1,7 @@
 ### $Id$
 ### $URL$
 
+import time
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
@@ -28,18 +29,26 @@ class update(Method):
     
     accepts = [
         Parameter(str, "Credential string"),
-        Parameter(dict, "Record dictionary to be updated")
+        Parameter(dict, "Record dictionary to be updated"),
+        Mixed(Parameter(str, "Request hash"),
+              Parameter(None, "Request hash not specified"))
         ]
 
     returns = Parameter(int, "1 if successful")
     
-    def call(self, cred, record_dict, caller_cred=None):
+    def call(self, cred, record_dict, request_hash=None, origin_hrn=None):
+        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, None, self.name))
+        # This cred might be an authority cred, not a user, so we cant use it to 
+        # authenticate the caller's request_hash. Let just get the caller's gid
+        # from the cred and authenticate using that
+        client_gid = Credential(string=cred).get_gid_caller()
+        client_gid_str = client_gid.save_to_string(save_parents=True)
+        self.api.auth.authenticateGid(client_gid_str, [cred], request_hash)
         self.api.auth.check(cred, "update")
-       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(), None, self.name))
         new_record = GeniRecord(dict = record_dict)
         type = new_record['type']
         hrn = new_record['hrn']
@@ -50,6 +59,7 @@ class update(Method):
         if not records:
             raise RecordNotFound(hrn)
         record = records[0]
+        record['last_updated'] = time.gmtime()
          
         # Update_membership needs the membership lists in the existing record
         # filled in, so it can see if members were added or removed
@@ -120,6 +130,6 @@ class update(Method):
             raise UnknownGeniType(type)
 
         # update membership for researchers, pis, owners, operators
-        self.api.update_membership(record, record)
+        self.api.update_membership(record, new_record)
 
         return 1