vm: properly support symbols on globals

dubzzz · danielleadams · commit b801873a8adb · 2023-04-02T21:39:47.000-04:00
A regression has been introduced in node 18.2.0, it makes the following snippet fails while it used to work in the past: ``` const assert = require('assert'); const vm = require('vm'); const global = vm.runInContext('this', vm.createContext()); const totoSymbol = Symbol.for('toto'); Object.defineProperty(global, totoSymbol, { enumerable: true, writable: true, value: 4, configurable: true, }); assert(Object.getOwnPropertySymbols(global).includes(totoSymbol)); ``` Regression introduced by: #42963. So I basically attempted to start understanding what it changed to make it fix the initial issue while not breaking the symbol related one. Fixes: #45983 PR-URL: #46458 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
@@ -530,7 +530,9 @@ void ContextifyContext::PropertySetterCallback(
     return;
 
   USE(ctx->sandbox()->Set(context, property, value));
-  args.GetReturnValue().Set(value);
+  if (is_contextual_store || is_function) {
+    args.GetReturnValue().Set(value);
+  }
 }
 
 // static
diff --git a/test/parallel/test-vm-global-symbol.js b/test/parallel/test-vm-global-symbol.js
@@ -0,0 +1,15 @@
+'use strict';
+require('../common');
+const assert = require('assert');
+const vm = require('vm');
+
+const global = vm.runInContext('this', vm.createContext());
+const totoSymbol = Symbol.for('toto');
+Object.defineProperty(global, totoSymbol, {
+  enumerable: true,
+  writable: true,
+  value: 4,
+  configurable: true,
+});
+assert.strictEqual(global[totoSymbol], 4);
+assert.ok(Object.getOwnPropertySymbols(global).includes(totoSymbol));

Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,9 @@ void ContextifyContext::PropertySetterCallback(`
`530`	`530`	`return;`
`531`	`531`
`532`	`532`	`USE(ctx->sandbox()->Set(context, property, value));`
`533`		`- args.GetReturnValue().Set(value);`
	`533`	`+ if (is_contextual_store \|\| is_function) {`
	`534`	`+ args.GetReturnValue().Set(value);`
	`535`	`+ }`
`534`	`536`	`}`
`535`	`537`
`536`	`538`	`// static`