Module: check_mk Branch: master Commit: 58fea1806555328c799e047b0d6010aa3b938334 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58fea180655532… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 4 11:19:26 2013 +0100 FIX: Fixed missing general.* permissions in auth.php on slave sites in case of distributed WATO setups --- ChangeLog | 2 ++ web/htdocs/index.py | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 680c565..4a2a144 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,8 @@ * FIX: fix title of foldable areas contained in list valuespecs * FIX: Fixed bug where pending log was not removed in multisite setup * FIX: Fixed generation of auth.php (Needed for NagVis Multisite Authorisation) + * FIX: Fixed missing general.* permissions in auth.php on slave sites in + case of distributed WATO setups Event Console: * Added UNIX socket for sending events to the EC diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 1022055..518ff6b 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -257,6 +257,12 @@ def handler(req, profiling = True): # Get page handler handler = pagehandlers.get(req.myfile, page_not_found) + # First initialization of the default permissions. Needs to be done before the auth_file + # (auth.php) ist written (it's done during showing the login page for the first time). + # Must be loaded before the "automation" call to have the general.* permissions available + # during automation action processing (e.g. hooks triggered by restart) + default_permissions.load() + # Special handling for automation.py. Sorry, this must be hardcoded # here. Automation calls bybass the normal authentication stuff if req.myfile == "automation": @@ -270,10 +276,6 @@ def handler(req, profiling = True): output_format = html.var("output_format", "html") html.set_output_format(output_format) - # First initialization of the default permissions. Needs to be done before the auth_file - # (auth.php) ist written (it's done during showing the login page for the first time). - default_permissions.load() - # Is the user set by the webserver? otherwise use the cookie based auth if not req.user or type(req.user) != str: config.auth_type = 'cookie'