crypto: use non-deprecated v8::Object::Set #17482

danbev · 2017-12-06T08:11:52Z

This commit updates node_crypto to use the non-deprecated Set functions
that return a v8::Maybe.

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
commit message follows commit guidelines

Affected core subsystem(s)

crypto

danbev · 2017-12-06T08:12:24Z

CI: https://ci.nodejs.org/job/node-test-pull-request/11906/

TimothyGu · 2017-12-06T08:16:44Z

src/node_crypto.cc

@@ -3562,7 +3600,7 @@ void Connection::SetSNICallback(const FunctionCallbackInfo<Value>& args) {
  }

  Local<Object> obj = Object::New(env->isolate());
-  obj->Set(env->onselect_string(), args[0]);
+  obj->Set(env->context(), env->onselect_string(), args[0]).FromJust();


Can exceptions be properly handled rather than crashing directly?

@TimothyGu I'd be happy to do that. In this case would that involve calling ThrowError?

Is this concern specifically to Connection::SetSNICallback or in general for the other changes in this PR as well?

ping @TimothyGu

@danbev To give a bit of context: An empty Maybe(Local) in the V8 API always means that there is already a pending exception, i.e. there’s no ThrowError necessary on our side.

For example, this Set() would return an empty Maybe if there is a setter for onselect and that throws an exception; I think in this situation that can only happen if somebody defined one on Object.prototype itself.

In this case: Since the function is called directly from JS, and there’s no cleanup of any sort necessary, it should be fine to just return; here if the Maybe is empty.

@addaleax Thanks for the details on this, I appreciate that!

Just to verify my understanding here.... Taking the example you suggested, if there is a setter for onselect:

Object.defineProperty(Object.prototype, 'onselect', { set: function(f) { console.log('throw error from setter...'); throw Error('dummy setter error'); } });

And setSNICallback is called, with the current solution the exception reported would be:

$ out/Debug/node test/parallel/test-tls-legacy-onselect.js throw error from setter... FATAL ERROR: v8::FromJust Maybe value is Nothing. 1: node::Abort() [/Users/danielbevenius/work/nodejs/node/out/Debug/node] 2: node::OnFatalError(char const*, char const*) [/Users/danielbevenius/work/nodejs/node/out/Debug/node] 3: v8::Utils::ReportApiFailure(char const*, char const*) [/Users/danielbevenius/work/nodejs/node/out/Debug/node] 4: v8::Utils::ApiCheck(bool, char const*, char const*) [/Users/danielbevenius/work/nodejs/node/out/Debug/node] 5: v8::V8::FromJustIsNothing() [/Users/danielbevenius/work/nodejs/node/out/Debug/node] 6: v8::Maybe<bool>::FromJust() const [/Users/danielbevenius/work/nodejs/node/out/Debug/node] 7: node::crypto::Connection::SetSNICallback(v8::FunctionCallbackInfo<v8::Value> const&) [/Users/danielbevenius/work/nodejs/node/out/Debug/node] 8: v8::internal::FunctionCallbackArguments::Call(void (*)(v8::FunctionCallbackInfo<v8::Value> const&)) [/Users/danielbevenius/work/nodejs/node/out/Debug/node] 9: v8::internal::MaybeHandle<v8::internal::Object> v8::internal::(anonymous namespace)::HandleApiCallHelper<false>(v8::internal::Isolate*, v8::internal::Handle<v8::internal::HeapObject>, v8::internal::Handle<v8::internal::HeapObject>, v8::internal::Handle<v8::internal::FunctionTemplateInfo>, v8::internal::Handle<v8::internal::Object>, v8::internal::BuiltinArguments) [/Users/danielbevenius/work/nodejs/node/out/Debug/node] 10: v8::internal::Builtin_Impl_HandleApiCall(v8::internal::BuiltinArguments, v8::internal::Isolate*) [/Users/danielbevenius/work/nodejs/node/out/Debug/node] 11: v8::internal::Builtin_HandleApiCall(int, v8::internal::Object**, v8::internal::Isolate*) [/Users/danielbevenius/work/nodejs/node/out/Debug/node] 12: 0x10e0737043c4 13: 0x10e0737f1600 Abort trap: 6

But instead what should happen is (in SetSNICallback):

if (obj->Set(env->context(), env->onselect_string(), args[0]).IsJust()) { conn->sniObject_.Reset(args.GetIsolate(), obj); }

And the reported error would be:

throw error from setter... /Users/danielbevenius/work/nodejs/node/test/parallel/test-tls-legacy-onselect.js:13 throw Error('dummy setter error'); ^ Error: dummy setter error at Object.set (/Users/danielbevenius/work/nodejs/node/test/parallel/test-tls-legacy-onselect.js:13:11) at Server.<anonymous> (/Users/danielbevenius/work/nodejs/node/test/parallel/test-tls-legacy-onselect.js:20:12) at Server.<anonymous> (/Users/danielbevenius/work/nodejs/node/test/common/index.js:520:15) at Server.emit (events.js:126:13) at TCP.onconnection (net.js:1595:8)

@danbev Yup, that’s what I’m suggesting (and I think @TimothyGu as well). 👍

Just as a note, I think it’s more common (and more readable) to return early rather than having the Reset() call inside the conditional, even if it boils down to the same thing.

Apropos this particular line, if the Set() call fails, something is probably very wrong. Handle failures when there is a reasonable expectation an operation can fail and otherwise let it crash.

@bnoordhuis I just want to make sure I'm not misunderstanding you here. Do you mean that in this case we should call FromJust()?

bnoordhuis · 2017-12-13T20:00:15Z

src/node_crypto.cc

@@ -2385,7 +2404,8 @@ void SSLWrap<Base>::VerifyError(const FunctionCallbackInfo<Value>& args) {
  Local<String> reason_string = OneByteString(isolate, reason);
  Local<Value> exception_value = Exception::Error(reason_string);
  Local<Object> exception_object = exception_value->ToObject(isolate);
-  exception_object->Set(w->env()->code_string(), OneByteString(isolate, code));
+  exception_object->Set(env->context(), w->env()->code_string(),


Could use w->env()->context() instead.

bnoordhuis · 2017-12-13T20:13:35Z

src/node_crypto.cc

-  target->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "Connection"),
-              t->GetFunction());
+  target->Set(env->context(), FIXED_ONE_BYTE_STRING(env->isolate(),
+              "Connection"),


Awkward line break. Can you put the FIXED_ONE_BYTE_STRING on a new line?

bnoordhuis · 2017-12-13T20:18:30Z

src/node_crypto.cc

@@ -3562,7 +3600,7 @@ void Connection::SetSNICallback(const FunctionCallbackInfo<Value>& args) {
  }

  Local<Object> obj = Object::New(env->isolate());
-  obj->Set(env->onselect_string(), args[0]);
+  obj->Set(env->context(), env->onselect_string(), args[0]).FromJust();


Apropos this particular line, if the Set() call fails, something is probably very wrong. Handle failures when there is a reasonable expectation an operation can fail and otherwise let it crash.

BridgeAR · 2018-01-19T17:37:09Z

This seems stalled. @danbev where do we stand here?

danbev · 2018-01-20T05:51:50Z

@BridgeAR I hope to revisit this next week (though I've got a sick kid here and I might not be working at all next week by the looks of it)

BridgeAR · 2018-01-31T02:42:44Z

Ping @danbev

This commit updates node_crypto to use the non-deprecated Set functions that return a v8::Maybe<bool>.

danbev · 2018-01-31T03:37:50Z

Rebased CI: https://ci.nodejs.org/job/node-test-pull-request/12835/

BridgeAR · 2018-02-01T09:39:05Z

Landed in ff21fb1

This commit updates node_crypto to use the non-deprecated Set functions that return a v8::Maybe<bool>. PR-URL: nodejs#17482 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>

This commit updates node_crypto to use the non-deprecated Set functions that return a v8::Maybe<bool>. PR-URL: #17482 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>

MylesBorins · 2018-03-20T15:53:47Z

Should this be backported to v8.x-staging or v6.x-staging? If yes please follow the guide and raise a backport PR, if not let me know or add the dont-land-on label.

This commit updates node_crypto to use the non-deprecated Set functions that return a v8::Maybe<bool>. PR-URL: nodejs#17482 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>

MylesBorins · 2018-05-23T18:53:33Z

ping re: backport @danbev

danbev · 2018-05-23T19:03:35Z

@MylesBorins Sorry I missed this 😞 I'll take a look at backporting tomorrow.

This commit updates node_crypto to use the non-deprecated Set functions that return a v8::Maybe<bool>. PR-URL: nodejs#17482 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>

This commit updates node_crypto to use the non-deprecated Set functions that return a v8::Maybe<bool>. Backport-PR-URL: #20931 PR-URL: #17482 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>

nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. crypto Issues and PRs related to the crypto subsystem. labels Dec 6, 2017

TimothyGu reviewed Dec 6, 2017

View reviewed changes

jasnell approved these changes Dec 6, 2017

View reviewed changes

MylesBorins force-pushed the master branch from b7405ab to 7f086dd Compare December 8, 2017 16:38

bnoordhuis approved these changes Dec 13, 2017

View reviewed changes

BridgeAR added the stalled Issues and PRs that are stalled. label Jan 19, 2018

maclover7 force-pushed the master branch from bb5575a to 993b716 Compare January 26, 2018 22:02

cjihrig force-pushed the master branch from 993b716 to 082f952 Compare January 26, 2018 22:36

danbev added 2 commits January 31, 2018 03:58

crypto: use non-deprecated v8::Object::Set

5a1a656

This commit updates node_crypto to use the non-deprecated Set functions that return a v8::Maybe<bool>.

squash: remove env var in VerifyError

ba42d57

danbev force-pushed the crypto_set_with_context branch from a9605e3 to ba42d57 Compare January 31, 2018 03:36

BridgeAR added author ready PRs that have at least one approval, no pending requests for changes, and a CI started. and removed stalled Issues and PRs that are stalled. labels Jan 31, 2018

BridgeAR approved these changes Jan 31, 2018

View reviewed changes

BridgeAR closed this Feb 1, 2018

MylesBorins mentioned this pull request Feb 21, 2018

v9.6.0 proposal #18902

Merged

danbev deleted the crypto_set_with_context branch February 28, 2018 07:30

MylesBorins added lts-watch-v6.x labels Mar 20, 2018

MylesBorins added backport-requested-v8.x and removed lts-watch-v6.x labels May 23, 2018

danbev mentioned this pull request May 24, 2018

[v8.x backport] crypto: use non-deprecated v8::Object::Set #20931

Closed

2 tasks

BethGriggs added backported-to-v8.x and removed backport-requested-v8.x labels Jun 20, 2018

MylesBorins mentioned this pull request Jul 9, 2018

v8.12.0 proposal #21593

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

crypto: use non-deprecated v8::Object::Set #17482

crypto: use non-deprecated v8::Object::Set #17482

danbev commented Dec 6, 2017

danbev commented Dec 6, 2017

TimothyGu Dec 6, 2017 •

edited

Loading

danbev Dec 6, 2017

apapirovski Dec 8, 2017

addaleax Dec 8, 2017

danbev Dec 13, 2017

addaleax Dec 13, 2017

bnoordhuis Dec 13, 2017

danbev Dec 18, 2017

bnoordhuis Dec 13, 2017

bnoordhuis Dec 13, 2017

bnoordhuis Dec 13, 2017

BridgeAR commented Jan 19, 2018 •

edited

Loading

danbev commented Jan 20, 2018

BridgeAR commented Jan 31, 2018

danbev commented Jan 31, 2018

BridgeAR commented Feb 1, 2018

MylesBorins commented Mar 20, 2018

MylesBorins commented May 23, 2018

danbev commented May 23, 2018

crypto: use non-deprecated v8::Object::Set #17482

crypto: use non-deprecated v8::Object::Set #17482

Conversation

danbev commented Dec 6, 2017

Checklist

Affected core subsystem(s)

danbev commented Dec 6, 2017

TimothyGu Dec 6, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

BridgeAR commented Jan 19, 2018 • edited Loading

danbev commented Jan 20, 2018

BridgeAR commented Jan 31, 2018

danbev commented Jan 31, 2018

BridgeAR commented Feb 1, 2018

MylesBorins commented Mar 20, 2018

MylesBorins commented May 23, 2018

danbev commented May 23, 2018

TimothyGu Dec 6, 2017 •

edited

Loading

BridgeAR commented Jan 19, 2018 •

edited

Loading