fixup! cli: implement --trace-env and --trace-env-[js|native]-stack

doc/api/cli.md

@@ -2628,6 +2628,7 @@ The following accesses will be printed:
 * Queries in the form of `Object.hasOwn(process.env, 'KEY')`,
   `process.env.hasOwnProperty('KEY')` or `'KEY' in process.env`.
 * Deletions in the form of `delete process.env.KEY`.
+* Enumerations inf the form of `...process.env` or `Object.keys(process.env)`.
 
 To print the stack trace of the access, use `--trace-env-js-stack` and/or
 `--trace-env-native-stack`.

src/node_credentials.cc

@@ -111,12 +111,7 @@ bool SafeGetenv(const char* key, std::string* text, Environment* env) {
       fprintf(stderr, "undefined\n");
     }
 
-    if (options->trace_env_native_stack) {
-      DumpNativeBacktrace(stderr);
-    }
-    if (options->trace_env_js_stack) {
-      DumpJavaScriptBacktrace(stderr);
-    }
+    PrintTraceEnvStack(options);
   }
 
   return has_env;

src/node_env_var.cc

@@ -338,10 +338,14 @@ Maybe<void> KVStore::AssignToObject(v8::Isolate* isolate,
 }
 
 void PrintTraceEnvStack(Environment* env) {
-  if (env->options()->trace_env_native_stack) {
+  PrintTraceEnvStack(env->options());
+}
+
+void PrintTraceEnvStack(std::shared_ptr<EnvironmentOptions> options) {
+  if (options->trace_env_native_stack) {
     DumpNativeBacktrace(stderr);
   }
-  if (env->options()->trace_env_js_stack) {
+  if (options->trace_env_js_stack) {
     DumpJavaScriptBacktrace(stderr);
   }
 }
@@ -483,6 +487,12 @@ static void EnvEnumerator(const PropertyCallbackInfo<Array>& info) {
   Environment* env = Environment::GetCurrent(info);
   CHECK(env->has_run_bootstrapping_code());
 
+  if (env->options()->trace_env) {
+    fprintf(stderr, "[--trace-env] enumerate environment variables\n");
+
+    PrintTraceEnvStack(env);
+  }
+
   info.GetReturnValue().Set(
       env->env_vars()->Enumerate(env->isolate()));
 }

src/node_internals.h

@@ -324,6 +324,9 @@ namespace credentials {
 bool SafeGetenv(const char* key, std::string* text, Environment* env = nullptr);
 }  // namespace credentials
 
+void PrintTraceEnvStack(Environment* env);
+void PrintTraceEnvStack(std::shared_ptr<EnvironmentOptions> options);
+
 void DefineZlibConstants(v8::Local<v8::Object> target);
 v8::Isolate* NewIsolate(v8::Isolate::CreateParams* params,
                         uv_loop_t* event_loop,

test/fixtures/process-env/enumerate.js

@@ -0,0 +1,3 @@
+Object.keys(process.env);
+
+const env = { ...process.env };

test/parallel/test-trace-env-stack.js

@@ -75,3 +75,11 @@ spawnSyncAndAssert(process.execPath, ['--trace-env-js-stack', fixtures.path('pro
     assert.match(output, /delete\.js:1:16/);
   }
 });
+
+// Check enumeration from user land.
+spawnSyncAndAssert(process.execPath, ['--trace-env-js-stack', fixtures.path('process-env', 'enumerate.js') ], {
+  stderr(output) {
+    assert.match(output, /enumerate\.js:1:8/);
+    assert.match(output, /enumerate\.js:3:26/);
+  }
+});

test/parallel/test-trace-env.js

@@ -79,3 +79,11 @@ spawnSyncAndAssert(process.execPath, ['--trace-env', fixtures.path('process-env'
     assert.match(output, /delete environment variable "FOO"/);
   }
 });
+
+// Check enumeration from user land.
+spawnSyncAndAssert(process.execPath, ['--trace-env', fixtures.path('process-env', 'enumerate.js') ], {
+  stderr(output) {
+    const matches = output.match(/enumerate environment variables/g);
+    assert.strictEqual(matches.length, 2);
+  }
+});