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

Ensure migrate master password dialog is not shown with a fresh installation. #5123

Browse Source
This commit is contained in:
Nikhil Mohite
2023-05-26 16:05:52 +05:30
committed by GitHub
parent 29053098fc
commit 67ef438730
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -835,13 +835,13 @@ def set_master_password():
from pgadmin.utils.crypto import decrypt from pgadmin.utils.crypto import decrypt
desktop_user = current_user desktop_user = current_user
try: try:
all_server = Server.query.all()
# pgAdmin will use the OS password manager to store the server # pgAdmin will use the OS password manager to store the server
# password, here migrating the existing saved server password to # password, here migrating the existing saved server password to
# OS password manager # OS password manager
if keyring.get_password( if keyring.get_password(
KEY_RING_SERVICE_NAME, KEY_RING_DESKTOP_USER.format( KEY_RING_SERVICE_NAME, KEY_RING_DESKTOP_USER.format(
desktop_user.username)) or data['password']: desktop_user.username)) or data['password']:
all_server = Server.query.all()
is_migrated = False is_migrated = False
for server in all_server: for server in all_server:
if server.password and data['password'] \ if server.password and data['password'] \
@@ -868,10 +868,15 @@ def set_master_password():
keyring_name=config.KEYRING_NAME if is_migrated else '' keyring_name=config.KEYRING_NAME if is_migrated else ''
) )
else: else:
return form_master_password_response( if len(all_server) == 0:
present=False, return form_master_password_response(
keyring_name=config.KEYRING_NAME present=True,
) )
else:
return form_master_password_response(
present=False,
keyring_name=config.KEYRING_NAME
)
except Exception as e: except Exception as e:
current_app.logger.warning( current_app.logger.warning(
'Fail set password using OS password manager' 'Fail set password using OS password manager'