Ensure server connection is successful for sslrootcert=system in serv…

…er configuration. #7907
pgadmin-org · Oct 14, 2024 · 2cc8f5f · 2cc8f5f
1 parent 9be0fef
commit 2cc8f5f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/web/pgadmin/static/js/components/PgTree/FileTreeItem/index.tsx b/web/pgadmin/static/js/components/PgTree/FileTreeItem/index.tsx
@@ -65,7 +65,7 @@ export class FileTreeItem extends React.Component<IItemRendererXProps & IItemRen
               ? 'file'
               : 'directory';
 
-    if (this.props.item.parent?.path) {
+    if (this.props.item.parent?.parent && this.props.item.parent?.path) {
       this.props.item.resolvedPathCache = this.props.item.parent.path + '/' + this.props.item._metadata.data.id;
     }
 

diff --git a/web/pgadmin/utils/driver/psycopg3/server_manager.py b/web/pgadmin/utils/driver/psycopg3/server_manager.py
@@ -670,11 +670,14 @@ def create_connection_string(self, database, user, password=None):
                 with_complete_path = False
                 orig_value = value
                 # Getting complete file path if the key is one of the below.
-                if key in ['passfile', 'sslcert', 'sslkey', 'sslrootcert',
-                           'sslcrl', 'sslcrldir']:
+                if key in ['passfile', 'sslcert', 'sslkey','sslcrl',
+                           'sslcrldir']:
                     with_complete_path = True
                     value = get_complete_file_path(value)
 
+                if key == 'sslrootcert' and value != 'system':
+                    dsn_args[key] = get_complete_file_path(value)
+
                 # If key is hostaddr and ssh tunnel is in use don't overwrite.
                 if key == 'hostaddr' and self.use_ssh_tunnel:
                     continue