1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: remove SecureContext _external getter

Browse Source 
This is unused inside Node core, so nothing good can
come from keeping it around.

PR-URL: https://github.com/nodejs/node/pull/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>
This commit is contained in:
Anna Henningsen 2018-04-24 00:25:21 +02:00 committed by Ruben Bridgewater
parent 124875cab2
commit 03e25b653a
No known key found for this signature in database
GPG Key ID: F07496B3EB3C1762
4 changed files with 1 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/node_crypto.cc
View File

@ -340,19 +340,6 @@ void SecureContext::Initialize(Environment* env, Local<Object> target) {
t->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "kTicketKeyIVIndex"), t->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "kTicketKeyIVIndex"),
Integer::NewFromUnsigned(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()); target->Set(secureContextString, t->GetFunction());
env->set_secure_context_constructor_template(t); 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> template <bool primary>
void SecureContext::GetCertificate(const FunctionCallbackInfo<Value>& args) { void SecureContext::GetCertificate(const FunctionCallbackInfo<Value>& args) {
SecureContext* wrap; SecureContext* wrap;

1
src/node_crypto.h
View File

@ -148,7 +148,6 @@ class SecureContext : public BaseObject {
const v8::FunctionCallbackInfo<v8::Value>& args); const v8::FunctionCallbackInfo<v8::Value>& args);
static void EnableTicketKeyCallback( static void EnableTicketKeyCallback(
const v8::FunctionCallbackInfo<v8::Value>& args); const v8::FunctionCallbackInfo<v8::Value>& args);
static void CtxGetter(const v8::FunctionCallbackInfo<v8::Value>& info);
template <bool primary> template <bool primary>
static void GetCertificate(const v8::FunctionCallbackInfo<v8::Value>& args); static void GetCertificate(const v8::FunctionCallbackInfo<v8::Value>& args);

17
test/parallel/test-accessor-properties.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
const common = require('../common'); require('../common');
// This tests that the accessor properties do not raise assertions // This tests that the accessor properties do not raise assertions
// when called with incompatible receivers. // when called with incompatible receivers.
@ -50,19 +50,4 @@ const UDP = process.binding('udp_wrap').UDP;
typeof Object.getOwnPropertyDescriptor(UDP.prototype, 'fd'), typeof Object.getOwnPropertyDescriptor(UDP.prototype, 'fd'),
'object' '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'
);
}
} }

22
test/parallel/test-tls-external-accessor.js
View File

@ -1,22 +0,0 @@
'use strict';
const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');
const assert = require('assert');
const tls = require('tls');
// Ensure accessing ._external doesn't hit an assert in the accessor method.
{
const pctx = tls.createSecureContext().context;
const cctx = Object.create(pctx);
assert.throws(() => cctx._external, TypeError);
pctx._external;
}
{
const pctx = tls.createSecurePair().credentials.context;
const cctx = Object.create(pctx);
assert.throws(() => cctx._external, TypeError);
pctx._external;
}