report: get stack trace with cross origin contexts

When a new context with a different security token is entered, or when no context is entered, `StackTrace::CurrentStackTrace` need to be explicitly set with flag `kExposeFramesAcrossSecurityOrigins` to avoid crashing. PR-URL: #44398 Reviewed-By: Rafael Gonzaga <[email protected]>

Author: legendecas

src/node_errors.cc

@@ -471,6 +471,11 @@ void OOMErrorHandler(const char* location, bool is_heap_oom){
  }
 
 if (report_on_fatalerror){
+// Trigger report with the isolate. Environment::GetCurrent may return
+// nullptr here:
+// - If the OOM is reported by a young generation space allocation,
+// Isolate::GetCurrentContext returns an empty handle.
+// - Otherwise, Isolate::GetCurrentContext returns a non-empty handle.
 TriggerNodeReport(isolate, message, "OOMError", "", Local<Object>());
  }
 

src/node_report.cc

@@ -470,8 +470,12 @@ static void PrintJavaScriptStack(JSONWriter* writer,
 void* samples[MAX_FRAME_COUNT];
  isolate->GetStackSample(state, samples, MAX_FRAME_COUNT, &info);
 
+constexpr StackTrace::StackTraceOptions stack_trace_options =
+static_cast<StackTrace::StackTraceOptions>(
+ StackTrace::kDetailed |
+ StackTrace::kExposeFramesAcrossSecurityOrigins);
  Local<StackTrace> stack = StackTrace::CurrentStackTrace(
- isolate, MAX_FRAME_COUNT, StackTrace::kDetailed);
+ isolate, MAX_FRAME_COUNT, stack_trace_options);
 
 if (stack->GetFrameCount() == 0){
 PrintEmptyJavaScriptStack(writer);

test/addons/report-api/binding.cc

@@ -1,6 +1,7 @@
 #include<node.h>
 #include<v8.h>
 
+using v8::Context;
 using v8::FunctionCallbackInfo;
 using v8::Isolate;
 using v8::Local;
@@ -43,11 +44,37 @@ void TriggerReportNoEnv(const FunctionCallbackInfo<Value>& args){
  Local<Value>());
 }
 
+voidTriggerReportNoContext(const FunctionCallbackInfo<Value>& args){
+ Isolate* isolate = args.GetIsolate();
+ Local<Context> context = isolate->GetCurrentContext();
+ context->Exit();
+
+if (isolate->GetCurrentContext().IsEmpty()){
+node::TriggerNodeReport(
+ isolate, "FooMessage", "BarTrigger", std::string(), Local<Value>());
+ }
+
+// Restore current context to avoid crashing in Context::Scope in
+// SpinEventLoop.
+ context->Enter();
+}
+
+voidTriggerReportNewContext(const FunctionCallbackInfo<Value>& args){
+ Isolate* isolate = args.GetIsolate();
+ Local<Context> context = Context::New(isolate);
+ Context::Scope context_scope(context);
+
+node::TriggerNodeReport(
+ isolate, "FooMessage", "BarTrigger", std::string(), Local<Value>());
+}
+
 voidinit(Local<Object> exports){
 NODE_SET_METHOD(exports, "triggerReport", TriggerReport);
 NODE_SET_METHOD(exports, "triggerReportNoIsolate", TriggerReportNoIsolate);
 NODE_SET_METHOD(exports, "triggerReportEnv", TriggerReportEnv);
 NODE_SET_METHOD(exports, "triggerReportNoEnv", TriggerReportNoEnv);
+NODE_SET_METHOD(exports, "triggerReportNoContext", TriggerReportNoContext);
+NODE_SET_METHOD(exports, "triggerReportNewContext", TriggerReportNewContext);
 }
 
 NODE_MODULE(NODE_GYP_MODULE_NAME, init)

test/addons/report-api/test.js

@@ -9,7 +9,7 @@ const tmpdir = require('../../common/tmpdir');
 constbinding=path.resolve(__dirname,`./build/${common.buildType}/binding`);
 constaddon=require(binding);
 
-functionmyAddonMain(method,hasJavaScriptFrames){
+functionmyAddonMain(method,{ hasIsolate, hasEnv }){
 tmpdir.refresh();
 process.report.directory=tmpdir.path;
 
@@ -19,26 +19,35 @@ function myAddonMain(method, hasJavaScriptFrames){
 assert.strictEqual(reports.length,1);
 
 constreport=reports[0];
-helper.validate(report);
+helper.validate(report,[
+['header.event','FooMessage'],
+['header.trigger','BarTrigger'],
+]);
 
 constcontent=require(report);
-assert.strictEqual(content.header.event,'FooMessage');
-assert.strictEqual(content.header.trigger,'BarTrigger');
 
 // Check that the javascript stack is present.
-if(hasJavaScriptFrames){
+if(hasIsolate){
 assert.strictEqual(content.javascriptStack.stack.findIndex((frame)=>frame.match('myAddonMain')),0);
 }else{
 assert.strictEqual(content.javascriptStack,undefined);
 }
+
+if(hasEnv){
+assert.strictEqual(content.header.threadId,0);
+}else{
+assert.strictEqual(content.header.threadId,null);
+}
 }
 
 constmethods=[
-['triggerReport',true],
-['triggerReportNoIsolate',false],
-['triggerReportEnv',true],
-['triggerReportNoEnv',false],
+['triggerReport',true,true],
+['triggerReportNoIsolate',false,false],
+['triggerReportEnv',true,true],
+['triggerReportNoEnv',false,false],
+['triggerReportNoContext',true,false],
+['triggerReportNewContext',true,false],
 ];
-for(const[method,hasJavaScriptFrames]ofmethods){
-myAddonMain(method,hasJavaScriptFrames);
+for(const[method,hasIsolate,hasEnv]ofmethods){
+myAddonMain(method,{ hasIsolate, hasEnv });
 }