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

Revert "Disable the master password requirement when using alternative authentication sources. Fixes #7012"

Browse Source 
This reverts commit 0c823455a0.
This commit is contained in:
Akshay Joshi
2022-04-22 15:58:06 +05:30
parent ab8e9a8ea5
commit faff8d1fb3
7 changed files with 9 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -706,8 +706,7 @@ def index():
auth_source = session['auth_source_manager'][
'source_friendly_name']
if not config.MASTER_PASSWORD_REQUIRED and 'pass_enc_key' in session\
and not config.ALTERNATE_ENCRYPTION_KEY:
if not config.MASTER_PASSWORD_REQUIRED and 'pass_enc_key' in session:
session['allow_save_password'] = False
response = Response(render_template(

3
web/pgadmin/utils/master_password.py
View File

@@ -33,9 +33,6 @@ def get_crypt_key():
elif config.MASTER_PASSWORD_REQUIRED \
and enc_key is None:
return False, None
elif not config.MASTER_PASSWORD_REQUIRED and config.SERVER_MODE and \
config.ALTERNATE_ENCRYPTION_KEY:
return True, config.ALTERNATE_ENCRYPTION_KEY
elif not config.MASTER_PASSWORD_REQUIRED and config.SERVER_MODE and \
'pass_enc_key' in session:
return True, session['pass_enc_key']