From 53e5f1378c25dbdc90a3a1f508cdbca59e28ff69 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 12 Jun 2022 20:02:48 +0200 Subject: [PATCH] shell scripts blocked by default only when listen-api --- packages/api/src/utility/platformInfo.js | 4 ++-- packages/api/src/utility/processArgs.js | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/api/src/utility/platformInfo.js b/packages/api/src/utility/platformInfo.js index 77143ef1a..393edbfaf 100644 --- a/packages/api/src/utility/platformInfo.js +++ b/packages/api/src/utility/platformInfo.js @@ -39,8 +39,8 @@ const platformInfo = { environment: process.env.NODE_ENV, platform, runningInWebpack: !!process.env.WEBPACK_DEV_SERVER_URL, - allowShellConnection: !!process.env.SHELL_CONNECTION || !!isElectron(), - allowShellScripting: !!process.env.SHELL_SCRIPTING || !!isElectron(), + allowShellConnection: !processArgs.listenApiChild || !!process.env.SHELL_CONNECTION || !!isElectron(), + allowShellScripting: !processArgs.listenApiChild || !!process.env.SHELL_SCRIPTING || !!isElectron(), defaultKeyfile: path.join(os.homedir(), '.ssh/id_rsa'), }; diff --git a/packages/api/src/utility/processArgs.js b/packages/api/src/utility/processArgs.js index d199237bd..68514c79f 100644 --- a/packages/api/src/utility/processArgs.js +++ b/packages/api/src/utility/processArgs.js @@ -12,6 +12,7 @@ const isForkedApi = process.argv.includes('--is-forked-api'); const pluginsDir = getNamedArg('--plugins-dir'); const workspaceDir = getNamedArg('--workspace-dir'); const listenApi = process.argv.includes('--listen-api'); +const listenApiChild = process.argv.includes('--listen-api-child') || listenApi; function getPassArgs() { const res = []; @@ -21,6 +22,9 @@ function getPassArgs() { if (global['PLUGINS_DIR']) { res.push('--plugins-dir', global['PLUGINS_DIR']); } + if (listenApiChild) { + res.push('listen-api-child'); + } return res; } @@ -32,4 +36,5 @@ module.exports = { pluginsDir, workspaceDir, listenApi, + listenApiChild, };