Module: check_mk
Branch: master
Commit: a2369e2d32ec8dd1a3f326ac405f2cdb6cbc10b4
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2369e2d32ec8d…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue May 24 18:34:28 2016 +0200
Fixed issues after refactoring
---
web/htdocs/login.py | 3 +--
web/htdocs/wato.py | 9 +++++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/web/htdocs/login.py b/web/htdocs/login.py
index 6a6ec9d..43eb7bd 100644
--- a/web/htdocs/login.py
+++ b/web/htdocs/login.py
@@ -240,8 +240,7 @@ def check_auth_http_header():
user_id = html.get_request_header(config.auth_by_http_header)
if user_id:
user_id = user_id.decode("utf-8")
- serial = load_serial(user_id)
- renew_cookie(auth_cookie_name(), user_id, serial)
+ renew_cookie(auth_cookie_name(), user_id)
else:
user_id = None
return user_id
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 679fcfe..92ef291 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -13920,6 +13920,7 @@ def page_user_profile(change_pw=False):
users[config.user_id][name] = value
# Change the password if requested
+ password_changed = False
if config.may('general.change_password'):
cur_password = html.var('cur_password')
password = html.var('password')
@@ -13954,8 +13955,7 @@ def page_user_profile(change_pw=False):
else:
users[config.user_id]['serial'] += 1
- # Set the new cookie to prevent logout for the current user
- login.set_auth_cookie(config.user_id,
users[config.user_id]['serial'])
+ password_changed = True
# Now, if in distributed environment, set the trigger for pushing the new
# auth information to the slave sites asynchronous
@@ -13963,6 +13963,11 @@ def page_user_profile(change_pw=False):
start_async_replication = True
userdb.save_users(users)
+
+ if password_changed:
+ # Set the new cookie to prevent logout for the current user
+ login.set_auth_cookie(config.user_id)
+
success = True
except MKUserError, e:
html.add_user_error(e.varname, e)