pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct the logic to set the SUPPORT_SSH_TUNNEL flag, if the flag is set the False in local config file, then we should not override it.

pull/17/head
Akshay Joshi 2018-05-18 11:26:11 +05:30
parent 719938a14c
commit fb0c322ccf
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/config.py
View File

@ -364,6 +364,11 @@ COOKIE_DEFAULT_DOMAIN = None
SESSION_COOKIE_DOMAIN = None
SESSION_COOKIE_SAMESITE = 'Lax'
##########################################################################
# SSH Tunneling supports only for Python 2.7 and 3.4+
##########################################################################
SUPPORT_SSH_TUNNEL = True
##########################################################################
# Local config settings
##########################################################################
@ -380,12 +385,10 @@ try:
except ImportError:
pass
##########################################################################
# SSH Tunneling supports only for Python 2.7 and 3.4+
##########################################################################
SUPPORT_SSH_TUNNEL = False
if (
(sys.version_info[0] == 2 and sys.version_info[1] >= 7) or
(sys.version_info[0] == 3 and sys.version_info[1] >= 4)
# SUPPORT_SSH_TUNNEL can be override in local config file and if that
# setting is False in local config then we should not check the Python version.
if (SUPPORT_SSH_TUNNEL is True and
((sys.version_info[0] == 2 and sys.version_info[1] < 7) or
(sys.version_info[0] == 3 and sys.version_info[1] < 4))
):
SUPPORT_SSH_TUNNEL = True
SUPPORT_SSH_TUNNEL = False