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

Fixed an exception occur while taking backup and SSL certificates/keys are not found in the specified path. #5133

Browse Source
This commit is contained in:
Yogesh Mahajan 2022-10-04 11:01:27 +05:30 committed by GitHub
parent 992dff64af
commit af97ed78ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_6_15.rst
View File

@ -29,6 +29,7 @@ Bug fixes
*********
| `Issue #5101 <https://github.com/pgadmin-org/pgadmin4/issues/5101>`_ - Ensure consistent orderings for ACLS when comparing schemas in the schema diff.
| `Issue #5133 <https://github.com/pgadmin-org/pgadmin4/issues/5133>`_ - Fixed an exception occur while taking backup and SSL certificates/keys are not found in the specified path.
| `Issue #5145 <https://github.com/pgadmin-org/pgadmin4/issues/5145>`_ - Fixed intermittent error shown while OAuth2 login.
| `Issue #5167 <https://github.com/pgadmin-org/pgadmin4/issues/5167>`_ - Ensure that the path to the psqlrc file is correct when multiple users open the PSQL tool at the same time.
| `Issue #5188 <https://github.com/pgadmin-org/pgadmin4/issues/5188>`_ - Ensure that the continue/start button should be disabled if the user stops the Debugger for the procedures.

13
web/pgadmin/misc/bgprocess/processes.py
View File

@ -802,12 +802,15 @@ class BatchProcess(object):
# Set SSL related ENV variables
if server.sslcert and server.sslkey and server.sslrootcert:
# SSL environment variables
sslcert = get_complete_file_path(server.sslcert)
sslkey = get_complete_file_path(server.sslkey)
sslrootcert = get_complete_file_path(server.sslrootcert)
self.env['PGSSLMODE'] = server.ssl_mode
self.env['PGSSLCERT'] = get_complete_file_path(server.sslcert)
self.env['PGSSLKEY'] = get_complete_file_path(server.sslkey)
self.env['PGSSLROOTCERT'] = get_complete_file_path(
server.sslrootcert
)
self.env['PGSSLCERT'] = '' if sslcert is None else sslcert
self.env['PGSSLKEY'] = '' if sslkey is None else sslkey
self.env['PGSSLROOTCERT'] = \
'' if sslrootcert is None else sslrootcert
# Set service name related ENV variable
if server.service: