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

Fixed an issue where the change server password is not working in desktop mode #6902

Browse Source
This commit is contained in:
Nikhil Mohite 2023-11-09 12:06:42 +05:30 committed by GitHub
parent 85dd1e92ad
commit d4b57edede
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
web/pgadmin/browser/server_groups/servers/__init__.py
View File

@ -1810,13 +1810,28 @@ class ServerNode(PGChildNodeView):
elif request.data: elif request.data:
data = json.loads(request.data) data = json.loads(request.data)
crypt_key = get_crypt_key()[1] crypt_key = None
if config.DISABLED_LOCAL_PASSWORD_STORAGE:
# Get enc key
crypt_key_present, crypt_key = get_crypt_key()
if not crypt_key_present:
raise CryptKeyMissing
# Fetch Server Details # Fetch Server Details
server = Server.query.filter_by(id=sid).first() server = Server.query.filter_by(id=sid).first()
if server is None: if server is None:
return bad_request(self.not_found_error_msg()) return bad_request(self.not_found_error_msg())
spassword = None
if not config.DISABLED_LOCAL_PASSWORD_STORAGE and \
bool(server.save_password):
sname = KEY_RING_USERNAME_FORMAT.format(server.name,
server.id)
spassword = keyring.get_password(
KEY_RING_SERVICE_NAME, sname)
# Fetch User Details. # Fetch User Details.
user = User.query.filter_by(id=current_user.id).first() user = User.query.filter_by(id=current_user.id).first()
if user is None: if user is None:
@ -1828,9 +1843,9 @@ class ServerNode(PGChildNodeView):
# If there is no password found for the server # If there is no password found for the server
# then check for pgpass file # then check for pgpass file
if not server.password and not manager.password and \ if (not server.password or spassword) and \
hasattr(server, 'connection_params') and \ not manager.password and hasattr(server, 'connection_params') \
'passfile' in server.connection_params and \ and 'passfile' in server.connection_params and \
manager.get_connection_param_value('passfile') and \ manager.get_connection_param_value('passfile') and \
server.connection_params['passfile'] == \ server.connection_params['passfile'] == \
manager.get_connection_param_value('passfile'): manager.get_connection_param_value('passfile'):
@ -1870,10 +1885,16 @@ class ServerNode(PGChildNodeView):
# Check against old password only if no pgpass file # Check against old password only if no pgpass file
if not is_passfile: if not is_passfile:
decrypted_password = decrypt(manager.password, crypt_key) if not config.DISABLED_LOCAL_PASSWORD_STORAGE:
if spassword:
decrypted_password = spassword
else:
decrypted_password = manager.password
else:
decrypted_password = decrypt(manager.password, crypt_key)
if isinstance(decrypted_password, bytes): if isinstance(decrypted_password, bytes):
decrypted_password = decrypted_password.decode() decrypted_password = decrypted_password.decode()
password = data['password'] password = data['password']
@ -1906,7 +1927,17 @@ class ServerNode(PGChildNodeView):
# Store password in sqlite only if no pgpass file # Store password in sqlite only if no pgpass file
if not is_passfile: if not is_passfile:
password = encrypt(data['newPassword'], crypt_key) if config.DISABLED_LOCAL_PASSWORD_STORAGE:
password = encrypt(data['newPassword'], crypt_key)
elif not config.DISABLED_LOCAL_PASSWORD_STORAGE:
if config.ALLOW_SAVE_PASSWORD and bool(
server.save_password):
keyring.set_password(
KEY_RING_SERVICE_NAME,
KEY_RING_USERNAME_FORMAT.format(server.name,
server.id),
data['newPassword'])
password = data['newPassword']
# Check if old password was stored in pgadmin4 sqlite database. # Check if old password was stored in pgadmin4 sqlite database.
# If yes then update that password. # If yes then update that password.
if server.password is not None and config.ALLOW_SAVE_PASSWORD: if server.password is not None and config.ALLOW_SAVE_PASSWORD:

2
web/pgadmin/browser/server_groups/servers/tests/test_password_change.py
View File

@ -60,6 +60,8 @@ class DBPasswordChange(BaseTestGenerator):
def __init__(self, name, sid, password, passfile): def __init__(self, name, sid, password, passfile):
self.name = name self.name = name
self.sid = sid self.sid = sid
self.id = sid
self.save_password = False
self.password = password self.password = password
self.passfile = passfile self.passfile = passfile