src: add option to disable global search paths

PR-URL: https://github.com/nodejs/node/pull/39754
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
This commit is contained in:
Cheng Zhao 2021-08-13 11:03:25 +09:00 committed by Michaël Zasso
parent 40c6e838df
commit e4852e3ff5
No known key found for this signature in database
GPG Key ID: 770F7A9A5AE15600
7 changed files with 31 additions and 5 deletions

View File

@ -11,7 +11,8 @@ const {
const {
getOptionValue,
shouldNotRegisterESMLoader
noGlobalSearchPaths,
shouldNotRegisterESMLoader,
} = require('internal/options');
const { reconnectZeroFillToggle } = require('internal/buffer');
@ -420,7 +421,9 @@ function initializeWASI() {
function initializeCJSLoader() {
const CJSLoader = require('internal/modules/cjs/loader');
CJSLoader.Module._initPaths();
if (!noGlobalSearchPaths) {
CJSLoader.Module._initPaths();
}
// TODO(joyeecheung): deprecate this in favor of a proper hook?
CJSLoader.Module.runMain =
require('internal/modules/run_main').executeUserEntryPoint;

View File

@ -1,6 +1,10 @@
'use strict';
const { getOptions, shouldNotRegisterESMLoader } = internalBinding('options');
const {
getOptions,
noGlobalSearchPaths,
shouldNotRegisterESMLoader,
} = internalBinding('options');
let warnOnAllowUnauthorized = true;
@ -57,5 +61,6 @@ module.exports = {
},
getOptionValue,
getAllowUnauthorized,
shouldNotRegisterESMLoader
noGlobalSearchPaths,
shouldNotRegisterESMLoader,
};

View File

@ -886,6 +886,10 @@ inline bool Environment::hide_console_windows() const {
return flags_ & EnvironmentFlags::kHideConsoleWindows;
}
inline bool Environment::no_global_search_paths() const {
return flags_ & EnvironmentFlags::kNoGlobalSearchPaths;
}
bool Environment::filehandle_close_warning() const {
return emit_filehandle_warning_;
}

View File

@ -1203,6 +1203,7 @@ class Environment : public MemoryRetainer {
inline bool owns_inspector() const;
inline bool tracks_unmanaged_fds() const;
inline bool hide_console_windows() const;
inline bool no_global_search_paths() const;
inline uint64_t thread_id() const;
inline worker::Worker* worker_context() const;
Environment* worker_parent_env() const;

View File

@ -413,7 +413,12 @@ enum Flags : uint64_t {
// so that a worker thread can't load a native addon even if `execArgv`
// is overwritten and `--no-addons` is not specified but was specified
// for this Environment instance.
kNoNativeAddons = 1 << 6
kNoNativeAddons = 1 << 6,
// Set this flag to disable searching modules from global paths like
// $HOME/.node_modules and $NODE_PATH. This is used by standalone apps that
// do not expect to have their behaviors changed because of globally
// installed modules.
kNoGlobalSearchPaths = 1 << 7
};
} // namespace EnvironmentFlags

View File

@ -1078,6 +1078,12 @@ void Initialize(Local<Object> target,
Boolean::New(isolate, env->should_not_register_esm_loader()))
.Check();
target
->Set(context,
FIXED_ONE_BYTE_STRING(env->isolate(), "noGlobalSearchPaths"),
Boolean::New(isolate, env->no_global_search_paths()))
.Check();
Local<Object> types = Object::New(isolate);
NODE_DEFINE_CONSTANT(types, kNoOp);
NODE_DEFINE_CONSTANT(types, kV8Option);

View File

@ -572,6 +572,8 @@ void Worker::New(const FunctionCallbackInfo<Value>& args) {
worker->environment_flags_ |= EnvironmentFlags::kHideConsoleWindows;
if (env->no_native_addons())
worker->environment_flags_ |= EnvironmentFlags::kNoNativeAddons;
if (env->no_global_search_paths())
worker->environment_flags_ |= EnvironmentFlags::kNoGlobalSearchPaths;
}
void Worker::StartThread(const FunctionCallbackInfo<Value>& args) {