mirror of
https://github.com/kakwa/ldapcherry
synced 2024-11-25 18:54:29 +01:00
better log+fix in conf checking + fix in ppolicy handler
* log where the backend is declared (role or attribute) when inconsistency with main .ini file * fix check of configuration, only role file was checked 2 times instead on checking role one time and attribute one time * <dict>.keys() seems to have a different behavior between 2 (return "list") and 3 (return "dict_keys"), casting to "list" to avoid that.
This commit is contained in:
parent
42759f1cc4
commit
8c0bf94904
@ -149,10 +149,10 @@ class LdapCherry(object):
|
|||||||
backends = self.backends_params.keys()
|
backends = self.backends_params.keys()
|
||||||
for b in self.roles.get_backends():
|
for b in self.roles.get_backends():
|
||||||
if b not in backends:
|
if b not in backends:
|
||||||
raise MissingBackend(b)
|
raise MissingBackend(b, 'role')
|
||||||
for b in self.roles.get_backends():
|
for b in self.attributes.get_backends():
|
||||||
if b not in backends:
|
if b not in backends:
|
||||||
raise MissingBackend(b)
|
raise MissingBackend(b, 'attribute')
|
||||||
|
|
||||||
def _init_backends(self, config):
|
def _init_backends(self, config):
|
||||||
""" Init all backends
|
""" Init all backends
|
||||||
@ -1003,7 +1003,7 @@ class LdapCherry(object):
|
|||||||
def checkppolicy(self, **params):
|
def checkppolicy(self, **params):
|
||||||
""" search user page """
|
""" search user page """
|
||||||
self._check_auth(must_admin=False, redir_login=False)
|
self._check_auth(must_admin=False, redir_login=False)
|
||||||
keys = params.keys()
|
keys = list(params.keys())
|
||||||
if len(keys) != 1:
|
if len(keys) != 1:
|
||||||
cherrypy.response.status = 400
|
cherrypy.response.status = 400
|
||||||
return "bad argument"
|
return "bad argument"
|
||||||
|
@ -46,11 +46,12 @@ class MissingRole(Exception):
|
|||||||
|
|
||||||
|
|
||||||
class MissingBackend(Exception):
|
class MissingBackend(Exception):
|
||||||
def __init__(self, backend):
|
def __init__(self, backend, type_conf):
|
||||||
self.backend = backend
|
self.backend = backend
|
||||||
self.log = \
|
self.log = \
|
||||||
"backend '%(backend)s' does not exist in main config file" % \
|
"backend '%(backend)s' does not exist in main config file " \
|
||||||
{'backend': backend}
|
"but is still declared in '%(type_conf)s' file" % \
|
||||||
|
{'backend': backend, 'type_conf': type_conf}
|
||||||
|
|
||||||
|
|
||||||
class WrongBackend(Exception):
|
class WrongBackend(Exception):
|
||||||
|
Loading…
Reference in New Issue
Block a user