(simatec) Fix mySql Password

simatec · Nov 20, 2023 · 87e706d · 87e706d
1 parent f759e74
commit 87e706d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -56,6 +56,7 @@ When the adapter crashes or another Code error happens, this error message that
 * (simatec) dependencies updated
 * (simatec) Fix CIFS Password
 * (simatec) Fix mySql Password
+* (simatec) Fix pgSql Password
 
 ### 2.9.3 (2023-11-11)
 * (simatec) Fix Port for Filerserver

diff --git a/lib/restore/pgsql.js b/lib/restore/pgsql.js
@@ -2,6 +2,13 @@ const fs = require('fs');
 const path = require('path');
 
 function replayPgSql(options, fileNamePgsql, log, callback) {
+
+    if ((options.pass.startsWith(`"`) && options.pass.endsWith(`"`)) || (options.pass.startsWith(`'`) && options.pass.endsWith(`'`))) {
+        options.pass = options.pass;
+    } else {
+        options.pass = `"${options.pass}"`;
+    }
+
     const { exec } = require('child_process');
     // create DB before executing script  psql -c "create database Db name;" postgresql://iobroker:iobroker@localhost:5432/
     const cmdCreate = `psql -c "create database ${options.dbName};" postgresql://${options.user}:${options.pass}@${options.host}:${options.port}/`;

diff --git a/lib/scripts/30-pgsql.js b/lib/scripts/30-pgsql.js
@@ -49,6 +49,12 @@ async function startBackup(options, log, callback) {
         options.context.fileNames = options.context.fileNames || [];
         options.context.fileNames.push(fileName);
 
+        if ((options.pass.startsWith(`"`) && options.pass.endsWith(`"`)) || (options.pass.startsWith(`'`) && options.pass.endsWith(`'`))) {
+            options.pass = options.pass;
+        } else {
+            options.pass = `"${options.pass}"`;
+        }
+
         const child_process = require('child_process');
 
         child_process.exec(`${options.exe ? options.exe : 'pg_dump'}  --dbname=postgresql://${options.user}:${options.pass}@${options.host}:${options.port}/${options.dbName} > ${fileNamePgsql}`, {maxBuffer: 10 * 1024 * 1024}, async (error, stdout, stderr) => {