Skip to content

Quote params and use shell: true #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smathermather merged 1 commit into from
Apr 30, 2026
+9 −8
Merged

Quote params and use shell: true #268

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions libs/odmRunner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ let config = require('../config.js');
let logger = require('./logger');
let utils = require('./utils');

const shQuote = s => {
s = s.replace(/"/g, "")
return `"${s}"`;
}

module.exports = {
run: function(options, projectName, done, outputReceived){
assert(projectName !== undefined, "projectName must be specified");
Expand All @@ -36,7 +41,7 @@ module.exports = {
if (os.platform() === "win32"){
// On Windows, we need to add quotes around the file path
// otherwise it doesn't work when there are spaces in the path
command = `"${command}"`;
command = shQuote(command);
}

for (var name in options){
Expand All @@ -49,11 +54,11 @@ module.exports = {

// We don't specify "--time true" (just "--time")
if (typeof value !== 'boolean'){
params.push(value);
params.push(shQuote(value));
}
}

params.push(projectName);
params.push(shQuote(projectName));

logger.info(`About to run: ${command} ${params.join(" ")}`);

Expand All @@ -79,7 +84,7 @@ module.exports = {
// Launch
const env = utils.clone(process.env);
env.ODM_NONINTERACTIVE = 1;
let childProcess = spawn(command, params, {cwd: config.odm_path, env});
let childProcess = spawn(command, params, {cwd: config.odm_path, env, shell: true });

childProcess
.on('exit', (code, signal) => done(null, code, signal))
Expand Down Expand Up @@ -133,10 +138,6 @@ module.exports = {
const env = utils.clone(process.env);
env.ODM_OPTIONS_TMP_FILE = utils.tmpPath(".json");
env.ODM_PATH = config.odm_path;
const shQuote = s => {
s = s.replace(/"/g, "")
return `"${s}"`;
}

let childProcess = spawn(pythonExe, [shQuote(path.join(__dirname, "..", "helpers", "odmOptionsToJson.py")),
"--project-path", shQuote(config.odm_path), "bogusname"], { env, shell: true });
Expand Down
Loading