[checkmk-commits] 6552 FIX Role changes now create change entries on central site

Module: check_mk Branch: master Commit: a181ae6987961709bb3118810d2d3a28eff0cba3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a181ae69879617… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 7 13:56:16 2018 +0200 6552 FIX Role changes now create change entries on central site Changes to the roles in WATO triggered change entries for remote sites where the user login is allowed but were missing to add change entries for the central site. This is relevant for the "discard changes" feature. In case such a role change is made by one user and a another, less privileged user, tries to discards his changes it would be possible to discard the changes of the first user in case no change entry is created. Change-Id: I5ce62497b00158b6e55459c0fd267528f10ecfba --- .werks/6552 | 16 ++++++++++++++++ cmk/gui/config.py | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.werks/6552 b/.werks/6552 new file mode 100644 index 0000000..793214e --- /dev/null +++ b/.werks/6552 @@ -0,0 +1,16 @@ +Title: Role changes now create change entries on central site +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1536239687 + +Changes to the roles in WATO triggered change entries for remote sites where the user login +is allowed but were missing to add change entries for the central site. + +This is relevant for the "discard changes" feature. In case such a role change is made by one user +and a another, less privileged user, tries to discards his changes it would be possible to discard +the changes of the first user in case no change entry is created. diff --git a/cmk/gui/config.py b/cmk/gui/config.py index 7acf278..b109980 100644 --- a/cmk/gui/config.py +++ b/cmk/gui/config.py @@ -1008,9 +1008,14 @@ def _has_distributed_wato_file(): and os.stat(cmk.paths.check_mk_config_dir + "/distributed_wato.mk").st_size != 0 +def get_login_sites(): + """Returns the WATO slave sites a user may login and the local site""" + return get_login_slave_sites() + [ omd_site() ] + + # TODO: All site listing functions should return the same data structure, e.g. a list of # pairs (site_id, site) -def get_login_sites(): +def get_login_slave_sites(): """Returns a list of site ids which are WATO slave sites and users can login""" sites = [] for site_id, site in wato_slave_sites():