From 1bc7134ec26959f7f6d663d086f0616177694ae1 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Wed, 13 May 2020 20:04:43 +0200 Subject: [PATCH 1/2] Fix error 500 on reset password in debug mode --- cps/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/admin.py b/cps/admin.py index 5cec8e26..ccfef4e1 100644 --- a/cps/admin.py +++ b/cps/admin.py @@ -939,7 +939,7 @@ def reset_user_password(user_id): if current_user is not None and current_user.is_authenticated: ret, message = reset_password(user_id) if ret == 1: - log.debug(u"Password for user %(user)s reset", user=message) + log.debug(u"Password for user %s reset", message) flash(_(u"Password for user %(user)s reset", user=message), category="success") elif ret == 0: log.error(u"An unknown error occurred. Please try again later.") From e8ac62cdd888295fb590b2e4d6f903b3c753fa85 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Wed, 13 May 2020 20:15:35 +0200 Subject: [PATCH 2/2] Moved password replace to prevent incomplete session --- cps/helper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cps/helper.py b/cps/helper.py index ee733983..d369a6d0 100644 --- a/cps/helper.py +++ b/cps/helper.py @@ -450,11 +450,11 @@ def reset_password(user_id): existing_user = ub.session.query(ub.User).filter(ub.User.id == user_id).first() if not existing_user: return 0, None - password = generate_random_password() - existing_user.password = generate_password_hash(password) if not config.get_mail_server_configured(): return 2, None try: + password = generate_random_password() + existing_user.password = generate_password_hash(password) ub.session.commit() send_registration_mail(existing_user.email, existing_user.nickname, password, True) return 1, existing_user.nickname