MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-10-29 15:25:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

PG-allow special characters in user/pw/dbname (#7307)

Browse Source 
* PG-handle special chars with encodeURIComponent

* PG backup-don't use dbname in dumpfile
This commit is contained in:
PTR 2025-09-29 19:58:56 +02:00 committed by GitHub
parent 5d3c3941f4
commit 63092f16c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
db.js
View File

@ -950,7 +950,7 @@ module.exports.CreateDB = function (parent, func) {
}); });
} else { // If not present, create the tables and indexes } else { // If not present, create the tables and indexes
//not needed, just use a create db statement: const pgtools = require('pgtools'); //not needed, just use a create db statement: const pgtools = require('pgtools');
DatastoreTest.query('CREATE DATABASE '+ databaseName + ';', [], function (err, res) { DatastoreTest.query('CREATE DATABASE "'+ databaseName + '";', [], function (err, res) {
if (err == null) { if (err == null) {
// Create the tables and indexes // Create the tables and indexes
DatastoreTest.end(); DatastoreTest.end();
@ -3420,8 +3420,8 @@ module.exports.CreateDB = function (parent, func) {
// Check that we have access to pg_dump // Check that we have access to pg_dump
parent.config.settings.autobackup.pgdumppath = path.normalize(parent.config.settings.autobackup.pgdumppath ? parent.config.settings.autobackup.pgdumppath : 'pg_dump'); parent.config.settings.autobackup.pgdumppath = path.normalize(parent.config.settings.autobackup.pgdumppath ? parent.config.settings.autobackup.pgdumppath : 'pg_dump');
let cmd = '"' + parent.config.settings.autobackup.pgdumppath + '"' let cmd = '"' + parent.config.settings.autobackup.pgdumppath + '"'
+ ' --dbname=postgresql://' + parent.config.settings.postgres.user + ":" +parent.config.settings.postgres.password + ' --dbname=postgresql://' + encodeURIComponent(parent.config.settings.postgres.user) + ":" + encodeURIComponent(parent.config.settings.postgres.password)
+ "@" + parent.config.settings.postgres.host + ":" + parent.config.settings.postgres.port + "/" + databaseName + "@" + parent.config.settings.postgres.host + ":" + parent.config.settings.postgres.port + "/" + encodeURIComponent(databaseName)
+ ' > ' + ((parent.platform == 'win32') ? '\"nul\"' : '\"/dev/null\"'); + ' > ' + ((parent.platform == 'win32') ? '\"nul\"' : '\"/dev/null\"');
const child_process = require('child_process'); const child_process = require('child_process');
child_process.exec(cmd, { cwd: backupPath }, function(error, stdout, stdin) { child_process.exec(cmd, { cwd: backupPath }, function(error, stdout, stdin) {
@ -3614,11 +3614,11 @@ module.exports.CreateDB = function (parent, func) {
}); });
} else if (obj.databaseType == DB_POSTGRESQL) { } else if (obj.databaseType == DB_POSTGRESQL) {
// Perform a PostgresDump backup // Perform a PostgresDump backup
const newBackupFile = databaseName + '-pgdump-' + fileSuffix + '.sql'; const newBackupFile = 'pgdump-' + fileSuffix + '.sql';
obj.newDBDumpFile = path.join(backupPath, newBackupFile); obj.newDBDumpFile = path.join(backupPath, newBackupFile);
let cmd = '"' + parent.config.settings.autobackup.pgdumppath + '"' let cmd = '"' + parent.config.settings.autobackup.pgdumppath + '"'
+ ' --dbname=postgresql://' + parent.config.settings.postgres.user + ":" +parent.config.settings.postgres.password + ' --dbname=postgresql://' + encodeURIComponent(parent.config.settings.postgres.user) + ":" + encodeURIComponent(parent.config.settings.postgres.password)
+ "@" + parent.config.settings.postgres.host + ":" + parent.config.settings.postgres.port + "/" + databaseName + "@" + parent.config.settings.postgres.host + ":" + parent.config.settings.postgres.port + "/" + encodeURIComponent(databaseName)
+ " --file=" + obj.newDBDumpFile; + " --file=" + obj.newDBDumpFile;
parent.debug('backup','Postgresqldump cmd: ' + cmd); parent.debug('backup','Postgresqldump cmd: ' + cmd);
const child_process = require('child_process'); const child_process = require('child_process');