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

1) Fix issue where SSH tunnel connection using password is failing, it's regression of Master Password. Fixes #4320

Browse Source 
2) Fix some more issues related to SSH Tunnel(By: Akshay Joshi)
This commit is contained in:
Aditya Toshniwal
2019-06-05 12:07:24 +05:30
committed by Akshay Joshi
parent 13704a4f34
commit a588c2994d
5 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,9 +87,12 @@ class ServerManager(object):
if config.SUPPORT_SSH_TUNNEL:
self.use_ssh_tunnel = server.use_ssh_tunnel
self.tunnel_host = server.tunnel_host
self.tunnel_port = server.tunnel_port
self.tunnel_port = \
22 if server.tunnel_port is None else server.tunnel_port
self.tunnel_username = server.tunnel_username
self.tunnel_authentication = server.tunnel_authentication
self.tunnel_authentication = 0 \
if server.tunnel_authentication is None \
else server.tunnel_authentication
self.tunnel_identity_file = server.tunnel_identity_file
self.tunnel_password = server.tunnel_password
else:
@@ -469,8 +472,12 @@ WHERE db.oid = {0}""".format(did))
return False, gettext("Unauthorized request.")
if tunnel_password is not None and tunnel_password != '':
crypt_key_present, crypt_key = get_crypt_key()
if not crypt_key_present:
raise CryptKeyMissing()
try:
tunnel_password = decrypt(tunnel_password, user.password)
tunnel_password = decrypt(tunnel_password, crypt_key)
# Handling of non ascii password (Python2)
if hasattr(str, 'decode'):
tunnel_password = \