[checkmk-commits] #2717 FIX Fixed broken webserver level authentication integration ( e.g. basic, kerberos)

Module: check_mk Branch: master Commit: 818dde7d778908c514ed360fc437ee15f39658d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=818dde7d778908… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 30 10:44:40 2015 +0100 #2717 FIX Fixed broken webserver level authentication integration (e.g. basic, kerberos) Fixed a regression which broke the integration of the Check_MK GUI into an authentication which is done by the web server. This is for example a basic or kerberos authentication. --- .werks/2717 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/html_mod_python.py | 4 +++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/2717 b/.werks/2717 new file mode 100644 index 0000000..92aa61c --- /dev/null +++ b/.werks/2717 @@ -0,0 +1,11 @@ +Title: Fixed broken webserver level authentication integration (e.g. basic, kerberos) +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446198173 + +Fixed a regression which broke the integration of the Check_MK GUI into an authentication +which is done by the web server. This is for example a basic or kerberos authentication. diff --git a/ChangeLog b/ChangeLog index 587d7b2..84e30ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ * 2438 FIX: Manpage icons: fixed manpage links for active checks * 2691 FIX: Fixed exception in host address painter when displaying hosts/services of older sites * 2670 FIX: Fix problem that no site is configured when user has deleted only site... + * 2717 FIX: Fixed broken webserver level authentication integration (e.g. basic, kerberos)... WATO: * 2666 FIX: Fix search for global configuration variables: ignore case now diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 1cd3406..d2ae6ca 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -123,7 +123,9 @@ class html_mod_python(htmllib.html): def is_logged_in(self): - return self.user and type(self.user) == unicode + # Form based authentication always provides unicode strings, but the basic + # authentication of mod_python provides regular strings. + return self.user and type(self.user) in [ str, unicode ] def load_help_visible(self):