IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-09 06:55:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix an issue where user is not able to change the password when SMTP is not configured. #6274.

Browse Source 
Fix an issue where changing the password shows success but the new password is not working. #6730.
This commit is contained in:
Aditya Toshniwal 2023-09-12 15:16:09 +05:30 committed by GitHub
parent cfc338c5f0
commit 2f5fb6a996
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
web/pgadmin/browser/__init__.py
View File

@ -30,7 +30,8 @@ from flask_babel import gettext
from flask_gravatar import Gravatar from flask_gravatar import Gravatar
from flask_login import current_user, login_required from flask_login import current_user, login_required
from flask_login.utils import login_url from flask_login.utils import login_url
from flask_security.changeable import change_user_password from flask_security.changeable import change_user_password, \
send_password_changed_notice
from flask_security.decorators import anonymous_user_required from flask_security.decorators import anonymous_user_required
from flask_security.recoverable import reset_password_token_status, \ from flask_security.recoverable import reset_password_token_status, \
generate_reset_password_token, update_password generate_reset_password_token, update_password
@ -1071,30 +1072,27 @@ if hasattr(config, 'SECURITY_CHANGEABLE') and config.SECURITY_CHANGEABLE:
} }
elif req_json: elif req_json:
form = form_class(MultiDict(req_json)) form = form_class(MultiDict(req_json))
if form.validate_on_submit(): if form.validate():
errormsg = None errormsg = None
try: try:
change_user_password(current_user._get_current_object(), change_user_password(current_user._get_current_object(),
form.new_password.data, form.new_password.data,
autologin=False) notify=False,
except SOCKETErrorException as e: autologin=True)
# Handle socket errors which are not covered by try:
# SMTPExceptions. send_password_changed_notice(
logging.exception(str(e), exc_info=True) current_user._get_current_object())
errormsg = gettext(SMTP_SOCKET_ERROR).format(e) except Exception as _:
except (SMTPConnectError, SMTPResponseException, # No need to throw error if failed in sending email
SMTPServerDisconnected, SMTPDataError, SMTPHeloError, pass
SMTPException, SMTPAuthenticationError,
SMTPSenderRefused, SMTPRecipientsRefused) as ex:
# Handle smtp specific exceptions.
logging.exception(str(ex), exc_info=True)
errormsg = gettext(SMTP_ERROR).format(ex)
except Exception as e: except Exception as e:
# Handle other exceptions. # Handle other exceptions.
logging.exception(str(e), exc_info=True) logging.exception(str(e), exc_info=True)
errormsg = gettext(PASS_ERROR).format(e) errormsg = gettext(PASS_ERROR).format(e)
if request.get_json(silent=True) is None and errormsg is None: if request.get_json(silent=True) is not None and \
errormsg is None:
after_this_request(view_commit)
old_key = get_crypt_key()[1] old_key = get_crypt_key()[1]
set_crypt_key(form.new_password.data, False) set_crypt_key(form.new_password.data, False)
@ -1102,13 +1100,11 @@ if hasattr(config, 'SECURITY_CHANGEABLE') and config.SECURITY_CHANGEABLE:
import reencrpyt_server_passwords import reencrpyt_server_passwords
reencrpyt_server_passwords( reencrpyt_server_passwords(
current_user.id, old_key, form.new_password.data) current_user.id, old_key, form.new_password.data)
return redirect(get_url(_security.post_change_view) or
get_url(_security.post_login_view))
elif errormsg is not None: elif errormsg is not None:
return internal_server_error(errormsg) return internal_server_error(errormsg)
else: else:
return bad_request(list(form.errors.values())[0][0]) return bad_request(list(form.errors.values())[0][0])
return make_json_response( return make_json_response(
success=1, success=1,
info=gettext('pgAdmin user password changed successfully') info=gettext('pgAdmin user password changed successfully')