src: remove SecureContext _external getter

addaleax · BridgeAR · commit 03e25b653a7e · 2018-04-26T19:57:57.000+02:00
This is unused inside Node core, so nothing good can come from keeping it around. PR-URL: nodejs#20237 Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -340,19 +340,6 @@ void SecureContext::Initialize(Environment* env, Local<Object> target) {
   t->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "kTicketKeyIVIndex"),
          Integer::NewFromUnsigned(env->isolate(), kTicketKeyIVIndex));
 
-  Local<FunctionTemplate> ctx_getter_templ =
-      FunctionTemplate::New(env->isolate(),
-                            CtxGetter,
-                            env->as_external(),
-                            Signature::New(env->isolate(), t));
-
-
-  t->PrototypeTemplate()->SetAccessorProperty(
-      FIXED_ONE_BYTE_STRING(env->isolate(), "_external"),
-      ctx_getter_templ,
-      Local<FunctionTemplate>(),
-      static_cast<PropertyAttribute>(ReadOnly | DontDelete));
-
   target->Set(secureContextString, t->GetFunction());
   env->set_secure_context_constructor_template(t);
 }
@@ -1352,14 +1339,6 @@ int SecureContext::TicketCompatibilityCallback(SSL* ssl,
 }
 
 
-void SecureContext::CtxGetter(const FunctionCallbackInfo<Value>& info) {
-  SecureContext* sc;
-  ASSIGN_OR_RETURN_UNWRAP(&sc, info.This());
-  Local<External> ext = External::New(info.GetIsolate(), sc->ctx_);
-  info.GetReturnValue().Set(ext);
-}
-
-
 template <bool primary>
 void SecureContext::GetCertificate(const FunctionCallbackInfo<Value>& args) {
   SecureContext* wrap;
diff --git a/src/node_crypto.h b/src/node_crypto.h
@@ -148,7 +148,6 @@ class SecureContext : public BaseObject {
       const v8::FunctionCallbackInfo<v8::Value>& args);
   static void EnableTicketKeyCallback(
       const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void CtxGetter(const v8::FunctionCallbackInfo<v8::Value>& info);
 
   template <bool primary>
   static void GetCertificate(const v8::FunctionCallbackInfo<v8::Value>& args);
diff --git a/test/parallel/test-accessor-properties.js b/test/parallel/test-accessor-properties.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const common = require('../common');
+require('../common');
 
 // This tests that the accessor properties do not raise assertions
 // when called with incompatible receivers.
@@ -50,19 +50,4 @@ const UDP = process.binding('udp_wrap').UDP;
     typeof Object.getOwnPropertyDescriptor(UDP.prototype, 'fd'),
     'object'
   );
-
-  if (common.hasCrypto) { // eslint-disable-line node-core/crypto-check
-    // There are accessor properties in crypto too
-    const crypto = process.binding('crypto');
-
-    assert.throws(() => {
-      crypto.SecureContext.prototype._external;
-    }, TypeError);
-
-    assert.strictEqual(
-      typeof Object.getOwnPropertyDescriptor(
-        crypto.SecureContext.prototype, '_external'),
-      'object'
-    );
-  }
 }
diff --git a/test/parallel/test-tls-external-accessor.js b/test/parallel/test-tls-external-accessor.js
