Skip to content

Commit

Permalink
src: harden JSStream callbacks
Browse files Browse the repository at this point in the history
Since these are executing JS code, and in particular parts of that
code may be provided by userland, handle such exceptions in C++.

Ref: nodejs#17938 (comment)
  • Loading branch information
addaleax committed Jan 7, 2018
1 parent b171adc commit 7707494
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 13 deletions.
56 changes: 43 additions & 13 deletions src/js_stream.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ using v8::FunctionCallbackInfo;
using v8::FunctionTemplate;
using v8::HandleScope;
using v8::Local;
using v8::MaybeLocal;
using v8::Object;
using v8::String;
using v8::TryCatch;
using v8::Value;


Expand Down Expand Up @@ -87,24 +87,40 @@ bool JSStream::IsAlive() {
bool JSStream::IsClosing() {
HandleScope scope(env()->isolate());
Context::Scope context_scope(env()->context());
return MakeCallback(env()->isclosing_string(), 0, nullptr)
.ToLocalChecked()->IsTrue();
TryCatch try_catch(env()->isolate());
Local<Value> value;
if (!MakeCallback(env()->isclosing_string(), 0, nullptr).ToLocal(&value)) {
FatalException(env()->isolate(), try_catch);
}
return value->IsTrue();
}


int JSStream::ReadStart() {
HandleScope scope(env()->isolate());
Context::Scope context_scope(env()->context());
return MakeCallback(env()->onreadstart_string(), 0, nullptr)
.ToLocalChecked()->Int32Value();
TryCatch try_catch(env()->isolate());
Local<Value> value;
int value_int = 0;
if (!MakeCallback(env()->onreadstart_string(), 0, nullptr).ToLocal(&value) ||
!value->Int32Value(env()->context()).To(&value_int)) {
FatalException(env()->isolate(), try_catch);
}
return value_int;
}


int JSStream::ReadStop() {
HandleScope scope(env()->isolate());
Context::Scope context_scope(env()->context());
return MakeCallback(env()->onreadstop_string(), 0, nullptr)
.ToLocalChecked()->Int32Value();
TryCatch try_catch(env()->isolate());
Local<Value> value;
int value_int = 0;
if (!MakeCallback(env()->onreadstop_string(), 0, nullptr).ToLocal(&value) ||
!value->Int32Value(env()->context()).To(&value_int)) {
FatalException(env()->isolate(), try_catch);
}
return value_int;
}


Expand All @@ -117,10 +133,17 @@ int JSStream::DoShutdown(ShutdownWrap* req_wrap) {
};

req_wrap->Dispatched();
MaybeLocal<Value> res =
MakeCallback(env()->onshutdown_string(), arraysize(argv), argv);

return res.ToLocalChecked()->Int32Value();
TryCatch try_catch(env()->isolate());
Local<Value> value;
int value_int = 0;
if (!MakeCallback(env()->onshutdown_string(),
arraysize(argv),
argv).ToLocal(&value) ||
!value->Int32Value(env()->context()).To(&value_int)) {
FatalException(env()->isolate(), try_catch);
}
return value_int;
}


Expand All @@ -146,10 +169,17 @@ int JSStream::DoWrite(WriteWrap* w,
};

w->Dispatched();
MaybeLocal<Value> res =
MakeCallback(env()->onwrite_string(), arraysize(argv), argv);

return res.ToLocalChecked()->Int32Value();
TryCatch try_catch(env()->isolate());
Local<Value> value;
int value_int = 0;
if (!MakeCallback(env()->onwrite_string(),
arraysize(argv),
argv).ToLocal(&value) ||
!value->Int32Value(env()->context()).To(&value_int)) {
FatalException(env()->isolate(), try_catch);
}
return value_int;
}


Expand Down
19 changes: 19 additions & 0 deletions test/parallel/test-wrap-js-stream-exceptions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Flags: --expose-internals
'use strict';
const common = require('../common');
const assert = require('assert');
const JSStreamWrap = require('internal/wrap_js_stream');
const { Duplex } = require('stream');

process.once('uncaughtException', common.mustCall((err) => {
assert.strictEqual(err.message, 'exception!');
}));

const socket = new JSStreamWrap(new Duplex({
read: common.mustCall(),
write: common.mustCall((buffer, data, cb) => {
throw new Error('exception!');
})
}));

socket.end('foo');

0 comments on commit 7707494

Please sign in to comment.