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

Fix issue found while testing keyring related changes. #7076

Browse Source
This commit is contained in:
Yogesh Mahajan
2024-08-28 11:46:04 +05:30
committed by GitHub
parent f5c1cd9df8
commit c4dc839d7c
6 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/pgadmin/browser/server_groups/servers/utils.py
View File

@@ -267,9 +267,8 @@ def migrate_passwords_from_os_secret_storage(servers, enc_key):
tunnel_password = keyring.get_password(
KEY_RING_SERVICE_NAME, tunnel_name)
if tunnel_password:
tunnel_password = encrypt(tunnel_password, enc_key)
setattr(server, 'tunnel_password', tunnel_password)
keyring.delete_password(
KEY_RING_SERVICE_NAME, tunnel_name)
else:
setattr(server, 'tunnel_password', None)
passwords_migrated = True
@@ -355,6 +354,11 @@ def migrate_saved_passwords(master_key, master_password):
return passwords_migrated, error
elif master_password:
old_key = master_password
else:
current_app.logger.warning(
'Saved password were already migrated once. '
'Hence not migrating again. '
'May be the old master key was deleted.')
else:
old_key = current_user.password