FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

src: fix external module env and kDisableNodeOptionsEnv · nodejs/node@7aa9519 · GitHub

/ node Public

Commit 7aa9519

Browse files
RafaelGSS
authored and
targos
committed
src: fix external module env and kDisableNodeOptionsEnv
PR-URL: #52905 Fixes: #51227 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
1 parent c61f909 commit 7aa9519

4 files changed

Lines changed: 43 additions & 2 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2921,6 +2921,13 @@ equivalent to using the `--redirect-warnings=file` command-line flag.
29212921
added:
29222922
- v13.0.0
29232923
- v12.16.0
2924+
changes:
2925+
- version:
2926+
- REPLACEME
2927+
pr-url: https://github.com/nodejs/node/pull/52905
2928+
description:
2929+
Remove the possibility to use this env var with
2930+
kDisableNodeOptionsEnv for embedders.
29242931
-->
29252932

29262933
Path to a Node.js module which will be loaded in place of the built-in REPL.

‎src/node.cc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -921,6 +921,15 @@ static ExitCode InitializeNodeWithArgsInternal(
921921
&env_argv, nullptr, errors, kAllowedInEnvvar);
922922
if (exit_code != ExitCode::kNoFailure) return exit_code;
923923
}
924+
} else {
925+
std::string node_repl_external_env = {};
926+
if (credentials::SafeGetenv("NODE_REPL_EXTERNAL_MODULE",
927+
&node_repl_external_env) ||
928+
!node_repl_external_env.empty()) {
929+
errors->emplace_back("NODE_REPL_EXTERNAL_MODULE can't be used with "
930+
"kDisableNodeOptionsEnv");
931+
return ExitCode::kInvalidCommandLineArgument;
932+
}
924933
}
925934
#endif
926935

‎test/embedding/embedtest.cc‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,15 @@ NODE_MAIN(int argc, node::argv_type raw_argv[]) {
3535
std::shared_ptr<node::InitializationResult> result =
3636
node::InitializeOncePerProcess(
3737
args,
38-
{node::ProcessInitializationFlags::kNoInitializeV8,
39-
node::ProcessInitializationFlags::kNoInitializeNodeV8Platform});
38+
{
39+
node::ProcessInitializationFlags::kNoInitializeV8,
40+
node::ProcessInitializationFlags::kNoInitializeNodeV8Platform,
41+
// This is used to test NODE_REPL_EXTERNAL_MODULE is disabled with
42+
// kDisableNodeOptionsEnv. If other tests need NODE_OPTIONS
43+
// support in the future, split this configuration out as a
44+
// command line option.
45+
node::ProcessInitializationFlags::kDisableNodeOptionsEnv,
46+
});
4047

4148
for (const std::string& error : result->errors())
4249
fprintf(stderr, "%s: %s\n", args[0].c_str(), error.c_str());

‎test/embedding/test-embedding.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,21 @@ for (const extraSnapshotArgs of [
151151
[ '--', ...runEmbeddedArgs ],
152152
{ cwd: tmpdir.path });
153153
}
154+
155+
// Guarantee NODE_REPL_EXTERNAL_MODULE won't bypass kDisableNodeOptionsEnv
156+
{
157+
spawnSyncAndExit(
158+
binary,
159+
['require("os")'],
160+
{
161+
env: {
162+
...process.env,
163+
'NODE_REPL_EXTERNAL_MODULE': 'fs',
164+
},
165+
},
166+
{
167+
status: 9,
168+
signal: null,
169+
stderr: `${binary}: NODE_REPL_EXTERNAL_MODULE can't be used with kDisableNodeOptionsEnv\n`,
170+
});
171+
}

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL