summaryrefslogtreecommitdiffstats
path: root/cobbler/api.py
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-09-02 16:47:05 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-09-02 16:47:05 -0400
commita6dd9a579519d9aefd7bf6de7dc72b3267617b83 (patch)
tree41835138e8e32ab89f999b37454abe843a5480b7 /cobbler/api.py
parent8e0b44107abb1110a96b9e7ad2dca9c2bac4c411 (diff)
downloadcobbler-a6dd9a579519d9aefd7bf6de7dc72b3267617b83.tar.gz
cobbler-a6dd9a579519d9aefd7bf6de7dc72b3267617b83.tar.xz
cobbler-a6dd9a579519d9aefd7bf6de7dc72b3267617b83.zip
Updates on the acl feature. (policy acls for webui/xmlrpc, not to be confused with existing
setfacl features)
Diffstat (limited to 'cobbler/api.py')
-rw-r--r--cobbler/api.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/cobbler/api.py b/cobbler/api.py
index 68d1bf8d..01658a6d 100644
--- a/cobbler/api.py
+++ b/cobbler/api.py
@@ -84,14 +84,14 @@ class BootAPI:
return
self.logger_remote = self.__setup_logger("remote")
+ self.acl_engine = acls.AclEngine()
BootAPI.__has_loaded = True
module_loader.load_modules()
+
self._config = config.Config(self)
self.deserialize()
- self.acl_engine = acls.AclEngine()
-
self.authn = self.get_module_from_file(
"authentication",
"module",
@@ -487,17 +487,16 @@ class BootAPI:
"""
(Remote) access control.
"""
- rc = self.authn.authenticate(self,user,password)
self.log("authenticate",[user,rc])
+ rc = self.authn.authenticate(self,user,password)
return rc
def authorize(self,user,resource,arg1=None,arg2=None):
"""
(Remote) access control.
"""
- rc = self.authz.authorize(self,user,resource,arg1,arg2,self.acl_engine)
self.log("authorize",[user,resource,arg1,arg2,rc],debug=True)
- # if we clear authz, now ask the ACL engine
+ rc = self.authz.authorize(self,user,resource,arg1,arg2,acl_engine=self.acl_engine)
return rc
def build_iso(self,iso=None,profiles=None,systems=None,tempdir=None):