[checkmk-commits] Check_MK Git: check_mk: #2393 FIX Fixed exception "user_confdir" not set in case of exceptions during login

Module: check_mk Branch: master Commit: cedab164d3d763f65447a1627067f9aeda361b2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cedab164d3d763… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 1 10:23:41 2015 +0200 #2393 FIX Fixed exception "user_confdir" not set in case of exceptions during login --- .werks/2393 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/config.py | 16 +++++++++++++--- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.werks/2393 b/.werks/2393 new file mode 100644 index 0000000..0fc3207 --- /dev/null +++ b/.werks/2393 @@ -0,0 +1,10 @@ +Title: Fixed exception "user_confdir" not set in case of exceptions during login +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435738995 + + diff --git a/ChangeLog b/ChangeLog index 90509c6..4bb2a62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * 2361 FIX: Fix exception for missing key 'title' in certain cases of older customized views * 2379 FIX: Plugin-Output: Fixed handling of URLs within output of check_http... * 2380 FIX: Custom Host Notes painter was showing service notes when used in service based views + * 2393 FIX: Fixed exception "user_confdir" not set in case of exceptions during login WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/htdocs/config.py b/web/htdocs/config.py index be00813..c9e7c0c 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -58,6 +58,7 @@ except NameError: user = None user_id = None +user_confdir = None builtin_role_ids = [ "user", "admin", "guest" ] # hard coded in various permissions user_role_ids = [] @@ -267,13 +268,16 @@ def login(u): user_permissions["wato.users"] = True # ... with access to user management # Prepare users' own configuration directory - global user_confdir - user_confdir = config_dir + "/" + user_id - make_nagios_directory(user_confdir) + set_user_confdir(user_id) # load current on/off-switching states of sites read_site_config() +def set_user_confdir(user_id): + global user_confdir + user_confdir = config_dir + "/" + user_id + make_nagios_directory(user_confdir) + def get_language(default = None): if default == None: default = default_language @@ -401,6 +405,12 @@ def save_stars(stars): # Helper functions def load_user_file(name, deflt, lock = False): + # In some early error during login phase there are cases where it might + # happen that a user file is requested byt the user_confdir is not yet + # set. We have all information to set it, then do it. + if user_confdir == None: + set_user_confdir(name) + path = user_confdir + "/" + name + ".mk" try: if lock: