From: Tony Mack Date: Fri, 16 Oct 2009 03:34:20 +0000 (+0000) Subject: add request_hash argument to more method calls X-Git-Tag: sfa-0.9-6~169 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=87131431256d503ebc87fd01b5f50e7308c1108c;p=sfa.git add request_hash argument to more method calls --- diff --git a/sfa/methods/register_peer_object.py b/sfa/methods/register_peer_object.py index bb0f1003..2268bc61 100644 --- a/sfa/methods/register_peer_object.py +++ b/sfa/methods/register_peer_object.py @@ -32,11 +32,13 @@ class register_peer_object(Method): accepts = [ Parameter(str, "Credential string"), Parameter(dict, "Record dictionary containing record fields") + Parameter(str, "Request hash") ] returns = Parameter(int, "1 if successful") - def call(self, cred, record_dict, caller_cred=None): + def call(self, cred, record_dict, request_hash, caller_cred=None): + self.api.auth.authenticateCred(cred, [cred], request_hash) self.api.auth.check(cred, "register") if caller_cred==None: caller_cred=cred diff --git a/sfa/methods/remove_peer_object.py b/sfa/methods/remove_peer_object.py index f3ea1e7d..b9b337fe 100644 --- a/sfa/methods/remove_peer_object.py +++ b/sfa/methods/remove_peer_object.py @@ -27,16 +27,17 @@ class remove_peer_object(Method): accepts = [ Parameter(str, "Credential string"), Parameter(dict, "Record dictionary") + Parameter(str, "Request hash"), ] returns = Parameter(int, "1 if successful") - def call(self, cred, record, caller_cred=None): + def call(self, cred, record, request_hash, caller_cred=None): 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(), record['hrn'], self.name)) - + self.api.auth.authenticateCred(cred, [cred], request_hash) self.api.auth.check(cred, "remove") # Only allow the local interface or record owner to delete peer_records