From 762de2e043b967bdf0bdc1be8189ab21b055a808 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Wed, 5 Dec 2007 11:46:38 -0500 Subject: mod_python version of webui now operational at http://server/cobbler/web with pluggable authn/authz and using same tokens through entire communication chain. Should probably implement a session logout though. --- cobbler/remote.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cobbler/remote.py') diff --git a/cobbler/remote.py b/cobbler/remote.py index dcc01d1..081f8c8 100644 --- a/cobbler/remote.py +++ b/cobbler/remote.py @@ -456,9 +456,9 @@ class CobblerReadWriteXMLRPCInterface(CobblerXMLRPCInterface): self.logger.debug("invalid token: %s" % token) raise CX(_("invalid token: %s" % token)) - def check_access(self,token,resource): + def check_access(self,token,resource,arg1=None,arg2=None): validated = self.__validate_token(token) - return self.__authorize(token,resource) + return self.__authorize(token,resource,arg1,arg2) def __get_user_from_token(self,token): if not self.token_cache.has_key(token): @@ -481,9 +481,9 @@ class CobblerReadWriteXMLRPCInterface(CobblerXMLRPCInterface): self.logger.info("login failed: %s" % login_user) raise CX(_("login failed: %s") % login_user) - def __authorize(self,token,resource): + def __authorize(self,token,resource,arg1=None,arg2=None): user = self.__get_user_from_token(token) - if self.authz.authorize(user,resource): + if self.authz.authorize(user,resource,arg1,arg2): return True else: raise CX(_("user does not have access to resource: %s") % resource) -- cgit