From: Anil-Kumar Vengalil Date: Wed, 9 Sep 2009 15:16:30 +0000 (+0000) Subject: call logging X-Git-Tag: sfa-0.9-1~9 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7181b50b1b5db23b0b9811156676617beb00a146;p=sfa.git call logging --- diff --git a/sfa/methods/register.py b/sfa/methods/register.py index 31220ea3..543bdbe8 100644 --- a/sfa/methods/register.py +++ b/sfa/methods/register.py @@ -13,6 +13,7 @@ from sfa.util.genitable import GeniTable from sfa.util.debug import log from sfa.trust.auth import Auth from sfa.trust.gid import create_uuid +from sfa.trust.credential import Credential class register(Method): """ @@ -35,8 +36,13 @@ class register(Method): returns = Parameter(int, "String representation of gid object") - def call(self, cred, record_dict): + def call(self, cred, record_dict, caller_cred=None): self.api.auth.check(cred, "register") + 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)) record = GeniRecord(dict = record_dict) table = GeniTable() type = record['type'] diff --git a/sfa/methods/remove.py b/sfa/methods/remove.py index e66fb30c..dab6bf30 100644 --- a/sfa/methods/remove.py +++ b/sfa/methods/remove.py @@ -8,6 +8,7 @@ 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.trust.credential import Credential class remove(Method): """ @@ -31,8 +32,13 @@ class remove(Method): returns = Parameter(int, "1 if successful") - def call(self, cred, type, hrn): + def call(self, cred, type, hrn, caller_cred=None): self.api.auth.check(cred, "remove") + 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)) self.api.auth.verify_object_permission(hrn) table = GeniTable() filter = {'hrn': hrn} diff --git a/sfa/methods/resolve.py b/sfa/methods/resolve.py index 6e6f7b68..c326194e 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): """ @@ -29,9 +30,14 @@ class resolve(Method): returns = [GeniRecord] - def call(self, cred, hrn): + def call(self, cred, hrn, caller_cred=None): - self.api.auth.check(cred, 'resolve') + 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 +57,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 diff --git a/sfa/methods/update.py b/sfa/methods/update.py index ad602849..8c307e4d 100644 --- a/sfa/methods/update.py +++ b/sfa/methods/update.py @@ -10,6 +10,7 @@ from sfa.util.genitable import GeniTable from sfa.trust.certificate import Keypair, convert_public_key from sfa.trust.gid import * from sfa.util.debug import log +from sfa.trust.credential import Credential class update(Method): """ @@ -32,8 +33,13 @@ class update(Method): returns = Parameter(int, "1 if successful") - def call(self, cred, record_dict): + def call(self, cred, record_dict, caller_cred=None): 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'] diff --git a/sfa/util/geniclient.py b/sfa/util/geniclient.py index 87dcc15b..cbddf919 100644 --- a/sfa/util/geniclient.py +++ b/sfa/util/geniclient.py @@ -149,8 +149,8 @@ class GeniClient: # # @return GID object for the newly-registered record - def register(self, cred, record): - gid_str = self.server.register(cred.save_to_string(save_parents=True), record.as_dict()) + def register(self, cred, record, caller_cred=None): + gid_str = self.server.register(cred.save_to_string(save_parents=True), record.as_dict(), caller_cred) return GID(string = gid_str) ## @@ -161,8 +161,8 @@ class GeniClient: # @param type # @param hrn - def remove(self, cred, type, hrn): - result = self.server.remove(cred.save_to_string(save_parents=True), type, hrn) + def remove(self, cred, type, hrn, caller_cred=None): + result = self.server.remove(cred.save_to_string(save_parents=True), type, hrn, caller_cred) return result ## @@ -174,8 +174,8 @@ class GeniClient: # @param cred credential object specifying rights of the caller # @param name human readable name of object - def resolve(self, cred, name): - result_dict_list = self.server.resolve(cred.save_to_string(save_parents=True), name) + def resolve(self, cred, name, caller_cred=None): + result_dict_list = self.server.resolve(cred.save_to_string(save_parents=True), name, caller_cred) result_rec_list = [] for dict in result_dict_list: if dict['type'] in ['authority']: @@ -200,8 +200,8 @@ class GeniClient: # @param cred credential object specifying rights of the caller # @param record a record object to be updated - def update(self, cred, record): - result = self.server.update(cred.save_to_string(save_parents=True), record.as_dict()) + def update(self, cred, record, caller_cred=None): + result = self.server.update(cred.save_to_string(save_parents=True), record.as_dict(), caller_cred) return result