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

Ensure we don't show the full path on the server when using virtual filesystem roots in server mode for SSL certs. Fixes #2866

pull/6/head
Murtuza Zabuawala 2017-11-27 11:25:50 +00:00 committed by Dave Page
parent 542f2911a3
commit d614c88ada
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/browser/server_groups/servers/__init__.py
View File

@ -25,7 +25,6 @@ import config
from config import PG_DEFAULT_DRIVER from config import PG_DEFAULT_DRIVER
from pgadmin.model import db, Server, ServerGroup, User from pgadmin.model import db, Server, ServerGroup, User
from pgadmin.utils.driver import get_driver from pgadmin.utils.driver import get_driver
from pgadmin.utils import get_storage_directory
def has_any(data, keys): def has_any(data, keys):
""" """
@ -295,10 +294,9 @@ class ServerNode(PGChildNodeView):
field in required_ssl_fields_server_mode: field in required_ssl_fields_server_mode:
# Set file manager directory from preference # Set file manager directory from preference
import os import os
storage_dir = get_storage_directory()
file_extn = '.key' if field.endswith('key') else '.crt' file_extn = '.key' if field.endswith('key') else '.crt'
dummy_ssl_file = os.path.join( dummy_ssl_file = os.path.join(
storage_dir, '.postgresql', '<STORAGE_DIR>', '.postgresql',
'postgresql' + file_extn 'postgresql' + file_extn
) )
data[field] = dummy_ssl_file data[field] = dummy_ssl_file