Module: check_mk
Branch: master
Commit: 423bc07dc75d038042d0bada811f3a6ce05a1a37
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=423bc07dc75d03…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Feb 12 17:51:25 2016 +0100
Generalized some mod_python specific code
---
web/htdocs/index.py | 2 +-
web/htdocs/login.py | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/web/htdocs/index.py b/web/htdocs/index.py
index b125d6f..37c6f6f 100644
--- a/web/htdocs/index.py
+++ b/web/htdocs/index.py
@@ -32,7 +32,7 @@ import livestatus
import modules
import defaults, config, login
from lib import *
-from html_mod_python import *
+from html_mod_python import html_mod_python, FinalizeRequest
# Main entry point for all HTTP-requests (called directly by mod_apache)
def handler(req, fields = None, is_profiling = False):
diff --git a/web/htdocs/login.py b/web/htdocs/login.py
index 99f5ee4..912d765 100644
--- a/web/htdocs/login.py
+++ b/web/htdocs/login.py
@@ -26,7 +26,7 @@
import defaults, config, userdb
from lib import *
-from mod_python import apache
+from html_mod_python import FinalizeRequest
import os, time
try:
@@ -289,8 +289,7 @@ def normal_login_page(called_directly = True):
# When someone calls the login page directly and is already authed redirect to main
page
if html.myfile == 'login' and check_auth():
- html.immediate_browser_redirect(0.5, origtarget and origtarget or
'index.py')
- return apache.OK
+ html.http_redirect(origtarget and origtarget or 'index.py')
html.write('<div id="login">\n')
html.write('<img id="login_window"
src="images/login_window.png" />\n')
@@ -325,7 +324,6 @@ def normal_login_page(called_directly = True):
html.write("</div>\n")
html.footer()
- return apache.OK
def page_logout():
# Remove eventual existing cookie
@@ -338,7 +336,7 @@ def page_logout():
if not html.has_cookie('logout'):
html.set_http_header('WWW-Authenticate', 'Basic
realm="%s"' % defaults.nagios_auth_name)
html.set_cookie('logout', '1')
- raise apache.SERVER_RETURN, apache.HTTP_UNAUTHORIZED
+ raise FinalizeRequest(401)
else:
html.del_cookie('logout')
html.http_redirect(defaults.url_prefix + 'check_mk/')