Hi,
PFA patch to fix the issue where we were exposing the actual storage
directory path when user did not provided their own SSL certificates in
Server mode.
RM#2866
--
Regards,
Murtuza Zabuawala
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py
b/web/pgadmin/browser/server_groups/servers/__init__.py
index 91b27f7..7cd7ef5 100644
--- a/web/pgadmin/browser/server_groups/servers/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/__init__.py
@@ -25,7 +25,6 @@ import config
from config import PG_DEFAULT_DRIVER
from pgadmin.model import db, Server, ServerGroup, User
from pgadmin.utils.driver import get_driver
-from pgadmin.utils import get_storage_directory
def has_any(data, keys):
"""
@@ -295,10 +294,9 @@ class ServerNode(PGChildNodeView):
field in required_ssl_fields_server_mode:
# Set file manager directory from preference
import os
- storage_dir = get_storage_directory()
file_extn = '.key' if field.endswith('key') else '.crt'
dummy_ssl_file = os.path.join(
- storage_dir, '.postgresql',
+ '<STORAGE_DIR>', '.postgresql',
'postgresql' + file_extn
)
data[field] = dummy_ssl_file