IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-23 23:13:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure server connection is successful for sslrootcert=system in server configuration. #7907

Browse Source
This commit is contained in:
Yogesh Mahajan 2024-10-14 16:17:46 +05:30 committed by GitHub
parent 9be0fef470
commit 2cc8f5f272
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/static/js/components/PgTree/FileTreeItem/index.tsx
View File

@ -65,7 +65,7 @@ export class FileTreeItem extends React.Component<IItemRendererXProps & IItemRen
? 'file' ? 'file'
: 'directory'; : '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; this.props.item.resolvedPathCache = this.props.item.parent.path + '/' + this.props.item._metadata.data.id;
} }

7
web/pgadmin/utils/driver/psycopg3/server_manager.py
View File

@ -670,11 +670,14 @@ WHERE db.oid = {0}""".format(did))
with_complete_path = False with_complete_path = False
orig_value = value orig_value = value
# Getting complete file path if the key is one of the below. # Getting complete file path if the key is one of the below.
if key in ['passfile', 'sslcert', 'sslkey', 'sslrootcert', if key in ['passfile', 'sslcert', 'sslkey','sslcrl',
'sslcrl', 'sslcrldir']: 'sslcrldir']:
with_complete_path = True with_complete_path = True
value = get_complete_file_path(value) 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 is hostaddr and ssh tunnel is in use don't overwrite.
if key == 'hostaddr' and self.use_ssh_tunnel: if key == 'hostaddr' and self.use_ssh_tunnel:
continue continue