process: handle --expose-internals during pre-execution

joyeecheung · joyeecheung · commit 83972ff6ac0d · 2019-03-26T13:53:36.000-04:00
Instead of relying on the value of the CLI option when executing bootstrap/loaders.js. PR-URL: #26759 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
@@ -41,8 +41,7 @@
 
 // This file is compiled as if it's wrapped in a function with arguments
 // passed by node::RunBootstrapping()
-/* global process, getLinkedBinding, getInternalBinding */
-/* global exposeInternals, primordials */
+/* global process, getLinkedBinding, getInternalBinding, primordials */
 
 const {
   Reflect,
@@ -157,15 +156,19 @@ function NativeModule(id) {
   this.exportKeys = undefined;
   this.loaded = false;
   this.loading = false;
-  if (id === loaderId) {
+  this.canBeRequiredByUsers = !id.startsWith('internal/');
+}
+
+// To be called during pre-execution when --expose-internals is on.
+// Enables the user-land module loader to access internal modules.
+NativeModule.exposeInternals = function() {
+  for (const [id, mod] of NativeModule.map) {
     // Do not expose this to user land even with --expose-internals.
-    this.canBeRequiredByUsers = false;
-  } else if (id.startsWith('internal/')) {
-    this.canBeRequiredByUsers = exposeInternals;
-  } else {
-    this.canBeRequiredByUsers = true;
+    if (id !== loaderId) {
+      mod.canBeRequiredByUsers = true;
+    }
   }
-}
+};
 
 const {
   moduleIds,
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
@@ -133,6 +133,9 @@ function initializeReport() {
 
 function setupDebugEnv() {
   require('internal/util/debuglog').initializeDebugEnv(process.env.NODE_DEBUG);
+  if (getOptionValue('--expose-internals')) {
+    require('internal/bootstrap/loaders').NativeModule.exposeInternals();
+  }
 }
 
 function setupSignalHandlers() {
diff --git a/src/node.cc b/src/node.cc
@@ -296,8 +296,6 @@ MaybeLocal<Value> RunBootstrapping(Environment* env) {
       env->process_string(),
       FIXED_ONE_BYTE_STRING(isolate, "getLinkedBinding"),
       FIXED_ONE_BYTE_STRING(isolate, "getInternalBinding"),
-      // --expose-internals
-      FIXED_ONE_BYTE_STRING(isolate, "exposeInternals"),
       env->primordials_string()};
   std::vector<Local<Value>> loaders_args = {
       process,
@@ -307,7 +305,6 @@ MaybeLocal<Value> RunBootstrapping(Environment* env) {
       env->NewFunctionTemplate(binding::GetInternalBinding)
           ->GetFunction(context)
           .ToLocalChecked(),
-      Boolean::New(isolate, env->options()->expose_internals),
       env->primordials()};
 
   // Bootstrap internal loaders

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,9 @@ function initializeReport() {`
`133`	`133`
`134`	`134`	`function setupDebugEnv() {`
`135`	`135`	`require('internal/util/debuglog').initializeDebugEnv(process.env.NODE_DEBUG);`
	`136`	`+ if (getOptionValue('--expose-internals')) {`
	`137`	`+ require('internal/bootstrap/loaders').NativeModule.exposeInternals();`
	`138`	`+ }`
`136`	`139`	`}`
`137`	`140`
`138`	`141`	`function setupSignalHandlers() {`