Revert "vm,src: add property query interceptors"

This reverts commit d1f18b0bf1.

Closes: https://github.com/nodejs/node/issues/53346
PR-URL: https://github.com/nodejs/node/pull/53348
Fixes: https://github.com/nodejs/node/issues/53346
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Vinícius Lourenço Claro Cardoso <contact@viniciusl.com.br>

src/node_contextify.cc

@@ -51,7 +51,6 @@ using v8::FunctionTemplate;
 using v8::HandleScope;
 using v8::IndexedPropertyHandlerConfiguration;
 using v8::Int32;
-using v8::Integer;
 using v8::Intercepted;
 using v8::Isolate;
 using v8::Just;
@@ -177,22 +176,20 @@ void ContextifyContext::InitializeGlobalTemplates(IsolateData* isolate_data) {
   NamedPropertyHandlerConfiguration config(
       PropertyGetterCallback,
       PropertySetterCallback,
-      PropertyQueryCallback,
+      PropertyDescriptorCallback,
       PropertyDeleterCallback,
       PropertyEnumeratorCallback,
       PropertyDefinerCallback,
-      PropertyDescriptorCallback,
       {},
       PropertyHandlerFlags::kHasNoSideEffect);
 
   IndexedPropertyHandlerConfiguration indexed_config(
       IndexedPropertyGetterCallback,
       IndexedPropertySetterCallback,
-      IndexedPropertyQueryCallback,
+      IndexedPropertyDescriptorCallback,
       IndexedPropertyDeleterCallback,
       PropertyEnumeratorCallback,
       IndexedPropertyDefinerCallback,
-      IndexedPropertyDescriptorCallback,
       {},
       PropertyHandlerFlags::kHasNoSideEffect);
 
@@ -357,14 +354,12 @@ void ContextifyContext::RegisterExternalReferences(
     ExternalReferenceRegistry* registry) {
   registry->Register(MakeContext);
   registry->Register(CompileFunction);
-  registry->Register(PropertyQueryCallback);
   registry->Register(PropertyGetterCallback);
   registry->Register(PropertySetterCallback);
   registry->Register(PropertyDescriptorCallback);
   registry->Register(PropertyDeleterCallback);
   registry->Register(PropertyEnumeratorCallback);
   registry->Register(PropertyDefinerCallback);
-  registry->Register(IndexedPropertyQueryCallback);
   registry->Register(IndexedPropertyGetterCallback);
   registry->Register(IndexedPropertySetterCallback);
   registry->Register(IndexedPropertyDescriptorCallback);
@@ -463,51 +458,6 @@ bool ContextifyContext::IsStillInitializing(const ContextifyContext* ctx) {
   return ctx == nullptr || ctx->context_.IsEmpty();
 }
 
-// static
-Intercepted ContextifyContext::PropertyQueryCallback(
-    Local<Name> property, const PropertyCallbackInfo<Integer>& args) {
-  ContextifyContext* ctx = ContextifyContext::Get(args);
-
-  // Still initializing
-  if (IsStillInitializing(ctx)) {
-    return Intercepted::kNo;
-  }
-
-  Local<Context> context = ctx->context();
-  Local<Object> sandbox = ctx->sandbox();
-
-  PropertyAttribute attr;
-
-  Maybe<bool> maybe_has = sandbox->HasRealNamedProperty(context, property);
-  if (maybe_has.IsNothing()) {
-    return Intercepted::kNo;
-  } else if (maybe_has.FromJust()) {
-    Maybe<PropertyAttribute> maybe_attr =
-        sandbox->GetRealNamedPropertyAttributes(context, property);
-    if (!maybe_attr.To(&attr)) {
-      return Intercepted::kNo;
-    }
-    args.GetReturnValue().Set(attr);
-    return Intercepted::kYes;
-  } else {
-    maybe_has = ctx->global_proxy()->HasRealNamedProperty(context, property);
-    if (maybe_has.IsNothing()) {
-      return Intercepted::kNo;
-    } else if (maybe_has.FromJust()) {
-      Maybe<PropertyAttribute> maybe_attr =
-          ctx->global_proxy()->GetRealNamedPropertyAttributes(context,
-                                                              property);
-      if (!maybe_attr.To(&attr)) {
-        return Intercepted::kNo;
-      }
-      args.GetReturnValue().Set(attr);
-      return Intercepted::kYes;
-    }
-  }
-
-  return Intercepted::kNo;
-}
-
 // static
 Intercepted ContextifyContext::PropertyGetterCallback(
     Local<Name> property, const PropertyCallbackInfo<Value>& args) {
@@ -759,20 +709,6 @@ void ContextifyContext::PropertyEnumeratorCallback(
   args.GetReturnValue().Set(properties);
 }
 
-// static
-Intercepted ContextifyContext::IndexedPropertyQueryCallback(
-    uint32_t index, const PropertyCallbackInfo<Integer>& args) {
-  ContextifyContext* ctx = ContextifyContext::Get(args);
-
-  // Still initializing
-  if (IsStillInitializing(ctx)) {
-    return Intercepted::kNo;
-  }
-
-  return ContextifyContext::PropertyQueryCallback(
-      Uint32ToName(ctx->context(), index), args);
-}
-
 // static
 Intercepted ContextifyContext::IndexedPropertyGetterCallback(
     uint32_t index, const PropertyCallbackInfo<Value>& args) {

src/node_contextify.h

@@ -94,11 +94,7 @@ class ContextifyContext : public BaseObject {
       bool produce_cached_data,
       v8::Local<v8::Symbol> id_symbol,
       const errors::TryCatchScope& try_catch);
-  static void WeakCallback(
-      const v8::WeakCallbackInfo<ContextifyContext>& data);
-  static v8::Intercepted PropertyQueryCallback(
-      v8::Local<v8::Name> property,
-      const v8::PropertyCallbackInfo<v8::Integer>& args);
+  static void WeakCallback(const v8::WeakCallbackInfo<ContextifyContext>& data);
   static v8::Intercepted PropertyGetterCallback(
       v8::Local<v8::Name> property,
       const v8::PropertyCallbackInfo<v8::Value>& args);
@@ -118,8 +114,6 @@ class ContextifyContext : public BaseObject {
       const v8::PropertyCallbackInfo<v8::Boolean>& args);
   static void PropertyEnumeratorCallback(
       const v8::PropertyCallbackInfo<v8::Array>& args);
-  static v8::Intercepted IndexedPropertyQueryCallback(
-      uint32_t index, const v8::PropertyCallbackInfo<v8::Integer>& args);
   static v8::Intercepted IndexedPropertyGetterCallback(
       uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& args);
   static v8::Intercepted IndexedPropertySetterCallback(

test/parallel/test-vm-global-property-prototype.js

@@ -1,83 +0,0 @@
-'use strict';
-require('../common');
-const assert = require('assert');
-const vm = require('vm');
-
-const sandbox = {
-  onSelf: 'onSelf',
-};
-
-function onSelfGetter() {
-  return 'onSelfGetter';
-}
-
-Object.defineProperty(sandbox, 'onSelfGetter', {
-  get: onSelfGetter,
-});
-
-Object.defineProperty(sandbox, 1, {
-  value: 'onSelfIndexed',
-  writable: false,
-  enumerable: false,
-  configurable: true,
-});
-
-const ctx = vm.createContext(sandbox);
-
-const result = vm.runInContext(`
-Object.prototype.onProto = 'onProto';
-Object.defineProperty(Object.prototype, 'onProtoGetter', {
-  get() {
-    return 'onProtoGetter';
-  },
-});
-Object.defineProperty(Object.prototype, 2, {
-  value: 'onProtoIndexed',
-  writable: false,
-  enumerable: false,
-  configurable: true,
-});
-
-const resultHasOwn = {
-  onSelf: Object.hasOwn(this, 'onSelf'),
-  onSelfGetter: Object.hasOwn(this, 'onSelfGetter'),
-  onSelfIndexed: Object.hasOwn(this, 1),
-  onProto: Object.hasOwn(this, 'onProto'),
-  onProtoGetter: Object.hasOwn(this, 'onProtoGetter'),
-  onProtoIndexed: Object.hasOwn(this, 2),
-};
-
-const getDesc = (prop) => Object.getOwnPropertyDescriptor(this, prop);
-const resultDesc = {
-  onSelf: getDesc('onSelf'),
-  onSelfGetter: getDesc('onSelfGetter'),
-  onSelfIndexed: getDesc(1),
-  onProto: getDesc('onProto'),
-  onProtoGetter: getDesc('onProtoGetter'),
-  onProtoIndexed: getDesc(2),
-};
-({
-  resultHasOwn,
-  resultDesc,
-});
-`, ctx);
-
-// eslint-disable-next-line no-restricted-properties
-assert.deepEqual(result, {
-  resultHasOwn: {
-    onSelf: true,
-    onSelfGetter: true,
-    onSelfIndexed: true,
-    onProto: false,
-    onProtoGetter: false,
-    onProtoIndexed: false,
-  },
-  resultDesc: {
-    onSelf: { value: 'onSelf', writable: true, enumerable: true, configurable: true },
-    onSelfGetter: { get: onSelfGetter, set: undefined, enumerable: false, configurable: false },
-    onSelfIndexed: { value: 'onSelfIndexed', writable: false, enumerable: false, configurable: true },
-    onProto: undefined,
-    onProtoGetter: undefined,
-    onProtoIndexed: undefined,
-  },
-});