fix: NODE_OPTIONS parsing for child processes on macOS (#46243)
This commit is contained in:
parent
96197d9597
commit
7ee88bbdcb
6 changed files with 62 additions and 0 deletions
|
@ -90,7 +90,10 @@
|
||||||
|
|
||||||
#if BUILDFLAG(IS_MAC)
|
#if BUILDFLAG(IS_MAC)
|
||||||
#include <CoreFoundation/CoreFoundation.h>
|
#include <CoreFoundation/CoreFoundation.h>
|
||||||
|
#include "base/no_destructor.h"
|
||||||
|
#include "content/browser/mac_helpers.h"
|
||||||
#include "shell/browser/ui/cocoa/electron_bundle_mover.h"
|
#include "shell/browser/ui/cocoa/electron_bundle_mover.h"
|
||||||
|
#include "shell/common/process_util.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if BUILDFLAG(IS_LINUX)
|
#if BUILDFLAG(IS_LINUX)
|
||||||
|
@ -901,6 +904,21 @@ bool App::IsPackaged() {
|
||||||
|
|
||||||
#if BUILDFLAG(IS_WIN)
|
#if BUILDFLAG(IS_WIN)
|
||||||
return base_name != FILE_PATH_LITERAL("electron.exe");
|
return base_name != FILE_PATH_LITERAL("electron.exe");
|
||||||
|
#elif BUILDFLAG(IS_MAC)
|
||||||
|
static const base::NoDestructor<std::string> default_helper(
|
||||||
|
"electron helper" +
|
||||||
|
base::ToLowerASCII(content::kMacHelperSuffix_default));
|
||||||
|
static const base::NoDestructor<std::string> renderer_helper(
|
||||||
|
"electron helper" +
|
||||||
|
base::ToLowerASCII(content::kMacHelperSuffix_renderer));
|
||||||
|
static const base::NoDestructor<std::string> plugin_helper(
|
||||||
|
"electron helper" + base::ToLowerASCII(content::kMacHelperSuffix_plugin));
|
||||||
|
if (IsRendererProcess()) {
|
||||||
|
return base_name != *renderer_helper;
|
||||||
|
} else if (IsUtilityProcess()) {
|
||||||
|
return base_name != *default_helper && base_name != *plugin_helper;
|
||||||
|
}
|
||||||
|
return base_name != FILE_PATH_LITERAL("electron");
|
||||||
#else
|
#else
|
||||||
return base_name != FILE_PATH_LITERAL("electron");
|
return base_name != FILE_PATH_LITERAL("electron");
|
||||||
#endif
|
#endif
|
||||||
|
|
1
spec/fixtures/apps/node-options-utility-process/fail.js
vendored
Normal file
1
spec/fixtures/apps/node-options-utility-process/fail.js
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
process.exit(1);
|
15
spec/fixtures/apps/node-options-utility-process/main.js
vendored
Normal file
15
spec/fixtures/apps/node-options-utility-process/main.js
vendored
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
const { app, utilityProcess } = require('electron');
|
||||||
|
|
||||||
|
const path = require('node:path');
|
||||||
|
|
||||||
|
app.whenReady().then(() => {
|
||||||
|
const child = utilityProcess.fork(path.join(__dirname, 'noop.js'), [], {
|
||||||
|
stdio: 'inherit',
|
||||||
|
env: {
|
||||||
|
...process.env,
|
||||||
|
NODE_OPTIONS: `--require ${path.join(__dirname, 'fail.js')}`
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
child.once('exit', (code) => app.exit(code));
|
||||||
|
});
|
1
spec/fixtures/apps/node-options-utility-process/noop.js
vendored
Normal file
1
spec/fixtures/apps/node-options-utility-process/noop.js
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
process.exit(0);
|
4
spec/fixtures/apps/node-options-utility-process/package.json
vendored
Normal file
4
spec/fixtures/apps/node-options-utility-process/package.json
vendored
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
{
|
||||||
|
"name": "electron-test-node-options-utility-process",
|
||||||
|
"main": "main.js"
|
||||||
|
}
|
|
@ -697,6 +697,29 @@ describe('node feature', () => {
|
||||||
expect(code).to.equal(1);
|
expect(code).to.equal(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('does allow --require in utility process of non-packaged apps', async () => {
|
||||||
|
const appPath = path.join(fixtures, 'apps', 'node-options-utility-process');
|
||||||
|
// App should exit with code 1.
|
||||||
|
const child = childProcess.spawn(process.execPath, [appPath]);
|
||||||
|
const [code] = await once(child, 'exit');
|
||||||
|
expect(code).to.equal(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
// TODO(deepak1556): will be enabled in follow-up PR
|
||||||
|
// https://github.com/electron/electron/pull/46210
|
||||||
|
it.skip('does not allow --require in utility process of packaged apps', async () => {
|
||||||
|
const appPath = path.join(fixtures, 'apps', 'node-options-utility-process');
|
||||||
|
// App should exit with code 1.
|
||||||
|
const child = childProcess.spawn(process.execPath, [appPath], {
|
||||||
|
env: {
|
||||||
|
...process.env,
|
||||||
|
ELECTRON_FORCE_IS_PACKAGED: 'true'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
const [code] = await once(child, 'exit');
|
||||||
|
expect(code).to.equal(0);
|
||||||
|
});
|
||||||
|
|
||||||
it('does not allow --require in packaged apps', async () => {
|
it('does not allow --require in packaged apps', async () => {
|
||||||
const appPath = path.join(fixtures, 'module', 'noop.js');
|
const appPath = path.join(fixtures, 'module', 'noop.js');
|
||||||
const env = {
|
const env = {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue