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 pgAdmin failed to connect when the Postgres password included special characters. #5847

Browse Source
This commit is contained in:
Akshay Joshi
2023-02-13 16:49:18 +05:30
parent 026334a71a
commit 0fd1e0963e
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/static/js/Dialogs/index.jsx
View File

@@ -99,7 +99,7 @@ export function showServerPassword() {
})
.catch((err)=>{
return onFailure(
err, nodeObj, nodeData, treeNodeInfo, itemNodeData, status
err, null, nodeObj, nodeData, treeNodeInfo, itemNodeData, status
);
});
}}

35
web/pgadmin/utils/driver/psycopg2/server_manager.py
View File

@@ -29,6 +29,7 @@ from pgadmin.utils.exception import ConnectionLost, SSHTunnelConnectionLost,\
from pgadmin.utils.master_password import get_crypt_key
from pgadmin.utils.exception import ObjectGone
from pgadmin.utils.passexec import PasswordExec
from psycopg2.extensions import make_dsn
if config.SUPPORT_SSH_TUNNEL:
from sshtunnel import SSHTunnelForwarder, BaseSSHTunnelForwarderError
@@ -633,22 +634,21 @@ WHERE db.oid = {0}""".format(did))
This function is used to create connection string based on the
parameters.
"""
full_connection_string = \
'host=\'{0}\' port=\'{1}\' dbname=\'{2}\' user=\'{3}\''.format(
self.local_bind_host if self.use_ssh_tunnel else self.host,
self.local_bind_port if self.use_ssh_tunnel else self.port,
database, user)
self.display_connection_string = full_connection_string
dsn_args = dict()
dsn_args['host'] = \
self.local_bind_host if self.use_ssh_tunnel else self.host
dsn_args['port'] = \
self.local_bind_port if self.use_ssh_tunnel else self.port
dsn_args['dbname'] = database
dsn_args['user'] = user
# Make a copy to display the connection string on GUI.
display_dsn_args = dsn_args.copy()
# Password should not be visible into the connection string, so
# setting the value with password to 'xxxxxxx'.
if password:
self.display_connection_string = "{0} password='xxxxxxx'".format(
self.display_connection_string)
full_connection_string = "{0} password='{1}'".format(
full_connection_string, password)
display_dsn_args['password'] = 'xxxxxxx'
dsn_args['password'] = password
# Loop through all the connection parameters set in the server dialog.
if self.connection_params and isinstance(self.connection_params, dict):
@@ -666,11 +666,10 @@ WHERE db.oid = {0}""".format(did))
value = self.local_bind_host if self.use_ssh_tunnel else \
value
self.display_connection_string = "{0} {1}='{2}'".format(
self.display_connection_string, key,
orig_value if with_complete_path else value)
dsn_args[key] = value
display_dsn_args[key] = orig_value if with_complete_path else \
value
full_connection_string = \
"{0} {1}='{2}'".format(full_connection_string, key, value)
self.display_connection_string = make_dsn(**display_dsn_args)
return full_connection_string
return make_dsn(**dsn_args)