[checkmk-commits] Check_MK Git: check_mk: #2168 FIX Fixed automation actions with transid= -1 when using basic authentication

Module: check_mk Branch: master Commit: 088a70da23f174c5b9cd94312b91238ded458079 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=088a70da23f174… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 27 10:00:51 2015 +0100 #2168 FIX Fixed automation actions with transid=-1 when using basic authentication --- .werks/2168 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/index.py | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/.werks/2168 b/.werks/2168 new file mode 100644 index 0000000..51b2fbc --- /dev/null +++ b/.werks/2168 @@ -0,0 +1,10 @@ +Title: Fixed automation actions with transid=-1 when using basic authentication +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1427446830 + + diff --git a/ChangeLog b/ChangeLog index 983b3e3..43ff5b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -346,6 +346,7 @@ * 2150 FIX: Reworked internal logging mechanism... * 1953 FIX: Fixed processing of html processing in input fields... * 2157 FIX: LDAP: Fixed group-to-role/group-to-contactgroup sync with OpenLDAP (using posixGroup) + * 2168 FIX: Fixed automation actions with transid=-1 when using basic authentication WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 4a6462e..26604f1 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -207,6 +207,11 @@ def handler(req, fields = None, profiling = True): login.page_login(plain_error) release_all_locks() return apache.OK + else: + # In case of basic auth the user is already known, but we still need to decide + # whether or not the user is an automation user (which is allowed to use transid=-1) + if html.var("_secret"): + login.check_auth_automation() # Call userdb page hooks which are executed on a regular base to e.g. syncronize # information withough explicit user triggered actions