X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FRegister.py;h=87f9a0f8c0aecbdec0de04b65f1e81d9ee58b0ff;hb=02993db8cc4867b78b4618d287aa97006ac9d185;hp=4f5a452ca0e66b03e0c60094927285d90071268b;hpb=1cc10fee55cf95760ade2f6e4dd570d7dd60d969;p=sfa.git diff --git a/sfa/methods/Register.py b/sfa/methods/Register.py index 4f5a452c..87f9a0f8 100644 --- a/sfa/methods/Register.py +++ b/sfa/methods/Register.py @@ -1,17 +1,9 @@ -### $Id: register.py 16477 2010-01-05 16:31:37Z thierry $ -### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/register.py $ - -from sfa.trust.certificate import Keypair, convert_public_key -from sfa.trust.gid import * -from sfa.util.faults import * from sfa.util.method import Method -from sfa.util.parameter import Parameter, Mixed -from sfa.util.record import SfaRecord -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 +from sfa.storage.parameter import Parameter, Mixed + class Register(Method): """ Register an object with the registry. In addition to being stored in the @@ -35,17 +27,15 @@ class Register(Method): returns = Parameter(int, "String representation of gid object") def call(self, record, creds): - + # validate cred valid_creds = self.api.auth.checkCredentials(creds, 'register') + + # verify permissions + hrn = record.get('hrn', '') + self.api.auth.verify_object_permission(hrn) #log the call origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn() - - hrn = None - if 'hrn' in record: - hrn = record['hrn'] self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name)) - manager = self.api.get_interface_manager() - - return manager.register(self.api, record) + return self.api.manager.Register(self.api, record)