Skip to content
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.

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

src: fix execArgv in worker #53029

Merged
merged 1 commit into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions src/node_worker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -590,9 +590,8 @@ void Worker::New(const FunctionCallbackInfo<Value>& args) {
exec_argv.push_back(arg_string);
}
} else {
exec_argv_out = env->exec_argv();
exec_argv.insert(
exec_argv.end(), exec_argv_out.begin(), exec_argv_out.end());
exec_argv.end(), env->exec_argv().begin(), env->exec_argv().end());
}

std::vector<std::string> invalid_args{};
Expand All @@ -608,7 +607,9 @@ void Worker::New(const FunctionCallbackInfo<Value>& args) {

// The first argument is program name.
invalid_args.erase(invalid_args.begin());
if (errors.size() > 0 || invalid_args.size() > 0) {
// Only fail for explicitly provided execArgv, this protects from failures
// when execArgv from parent's execArgv is used (which is the default).
if (errors.size() > 0 || (invalid_args.size() > 0 && args[2]->IsArray())) {
Local<Value> error;
if (!ToV8Value(env->context(), errors.size() > 0 ? errors : invalid_args)
.ToLocal(&error)) {
Expand Down
21 changes: 18 additions & 3 deletions test/parallel/test-worker-cli-options.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,31 @@
// Flags: --expose-internals
// Flags: --expose-internals --expose-gc
aduh95 marked this conversation as resolved.
Show resolved Hide resolved
'use strict';
require('../common');
const { Worker } = require('worker_threads');
const assert = require('assert');

const CODE = `
// If the --expose-internals flag does not pass to worker
// require function will throw an error
require('internal/options');
global.gc();
`;
// Test if the flags is passed to worker threads

// Test if the flags is passed to worker threads correctly
// and do not throw an error with the invalid execArgv
// when execArgv is inherited from parent
// See https://github.com/nodejs/node/issues/52825
// See https://github.com/nodejs/node/issues/53011

// Inherited env, execArgv from the parent will be ok
new Worker(CODE, { eval: true });
new Worker(CODE, { eval: true, env: process.env, execArgv: ['--expose-internals'] });
// Pass process.env explicitly and inherited execArgv from parent will be ok
new Worker(CODE, { eval: true, env: process.env });
// Inherited env from the parent and pass execArgv (Node.js options) explicitly will be ok
new Worker(CODE, { eval: true, execArgv: ['--expose-internals'] });
// Pass process.env and execArgv (Node.js options) explicitly will be ok
new Worker(CODE, { eval: true, env: process.env, execArgv: ['--expose-internals'] });
// Pass execArgv (V8 options) explicitly will throw an error
assert.throws(() => {
new Worker(CODE, { eval: true, execArgv: ['--expose-gc'] });
}, /ERR_WORKER_INVALID_EXEC_ARGV/);