From aa95ff9f57b34a419a53dbc62d4b1b8b1bad970c Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Wed, 29 May 2019 12:50:48 +0530 Subject: [PATCH] Fix encoding issue for background process, it is regression of Master Password. Fixes #4303 --- web/pgadmin/utils/driver/psycopg2/server_manager.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web/pgadmin/utils/driver/psycopg2/server_manager.py b/web/pgadmin/utils/driver/psycopg2/server_manager.py index 0816d137e..424e536e7 100644 --- a/web/pgadmin/utils/driver/psycopg2/server_manager.py +++ b/web/pgadmin/utils/driver/psycopg2/server_manager.py @@ -449,9 +449,11 @@ WHERE db.oid = {0}""".format(did)) def export_password_env(self, env): if self.password: - password = decrypt( - self.password, current_user.password - ).decode() + crypt_key_present, crypt_key = get_crypt_key() + if not crypt_key_present: + return False, crypt_key + + password = decrypt(self.password, crypt_key).decode() os.environ[str(env)] = password def create_ssh_tunnel(self, tunnel_password):