8 Apr
2019
8 Apr
'19
2:20 a.m.
Module: check_mk
Branch: master
Commit: 1cdb443b2935f37462772ab367c809c8440f8387
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cdb443b2935f3…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Sat Apr 6 20:20:17 2019 +0200
Refactored login and logut pages to use class registration
Change-Id: I6aa4abf4075455580d68f95943fb64219fdee117
---
cmk/gui/login.py | 68 ++++++++++++++++++++++++++++++++----------------------
web/app/index.wsgi | 4 +++-
2 files changed, 43 insertions(+), 29 deletions(-)
diff --git a/cmk/gui/login.py b/cmk/gui/login.py
index 150e539..4661a27 100644
--- a/cmk/gui/login.py
+++ b/cmk/gui/login.py
@@ -36,7 +36,7 @@ import cmk.gui.utils as utils
from cmk.gui.log import logger
import cmk.gui.i18n
import cmk.gui.mobile
-import cmk.gui.pages
+from cmk.gui.pages import page_registry, Page
from cmk.gui.i18n import _
from cmk.gui.globals import html
from cmk.gui.htmllib import HTML
@@ -423,21 +423,31 @@ def do_login():
return "%s" % e
-(a)cmk.gui.pages.register("login")
-def page_login(no_html_output=False):
- # Initialize the cmk.gui.i18n for the login dialog. This might be overridden
- # later after user login
- cmk.gui.i18n.localize(html.request.var("lang", config.get_language()))
+(a)page_registry.register_page("login")
+class LoginPage(Page):
+ def __init__(self):
+ super(LoginPage, self).__init__()
+ self._no_html_output = False
- result = do_login()
- if isinstance(result, tuple):
- return result # Successful login
- elif no_html_output:
- raise MKAuthException(_("Invalid login credentials."))
+ def set_no_html_output(self, no_html_output):
+ self._no_html_output = no_html_output
- if html.mobile:
- return cmk.gui.mobile.page_login()
- return normal_login_page()
+ def page(self):
+ # Initialize the cmk.gui.i18n for the login dialog. This might be
+ # overridden later after user login
+ cmk.gui.i18n.localize(html.request.var("lang", config.get_language()))
+
+ result = do_login()
+ if isinstance(result, tuple):
+ return # Successful login
+
+ if self._no_html_output:
+ raise MKAuthException(_("Invalid login credentials."))
+
+ if html.mobile:
+ return cmk.gui.mobile.page_login()
+
+ return normal_login_page()
def normal_login_page(called_directly=True):
@@ -520,19 +530,21 @@ def normal_login_page(called_directly=True):
html.footer()
-(a)cmk.gui.pages.register("logout")
-def page_logout():
- invalidate_auth_session()
+(a)page_registry.register_page("logout")
+class LogoutPage(Page):
+ def page(self):
+ invalidate_auth_session()
- if auth_type == 'cookie':
- raise HTTPRedirect(config.url_prefix() + 'check_mk/login.py')
- else:
- # Implement HTTP logout with cookie hack
- if not html.request.has_cookie('logout'):
- html.response.headers[
- 'WWW-Authenticate'] = 'Basic realm="OMD Monitoring Site
%s"' % config.omd_site()
- html.response.set_http_cookie('logout', '1')
- raise FinalizeRequest(httplib.UNAUTHORIZED)
+ if auth_type == 'cookie':
+ raise HTTPRedirect(config.url_prefix() + 'check_mk/login.py')
else:
- html.response.delete_cookie('logout')
- raise HTTPRedirect(config.url_prefix() + 'check_mk/')
+ # Implement HTTP logout with cookie hack
+ if not html.request.has_cookie('logout'):
+ html.response.headers[
+ 'WWW-Authenticate'] = 'Basic realm="OMD Monitoring
Site %s"' % config.omd_site(
+ )
+ html.response.set_http_cookie('logout', '1')
+ raise FinalizeRequest(httplib.UNAUTHORIZED)
+ else:
+ html.response.delete_cookie('logout')
+ raise HTTPRedirect(config.url_prefix() + 'check_mk/')
diff --git a/web/app/index.wsgi b/web/app/index.wsgi
index 2398103..80db921 100644
--- a/web/app/index.wsgi
+++ b/web/app/index.wsgi
@@ -238,7 +238,9 @@ class Application(object):
# This either displays the login page or validates the information submitted
# to the login form. After successful login a http redirect to the
originally
# requested page is performed.
- login.page_login(self._plain_error())
+ login_page = login.LoginPage()
+ login_page.set_no_html_output(self._plain_error())
+ login_page.handle_page()
raise FinalizeRequest(httplib.OK)