async_hooks: prevent sync methods of async storage exiting outer context

Qard · BridgeAR · commit b304df97ffd4 · 2020-04-28T13:14:59.000+02:00
PR-URL: #31950 Reviewed-By: Vladimir de Turckheim <vlad2t@hotmail.com> Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
diff --git a/lib/async_hooks.js b/lib/async_hooks.js
@@ -257,14 +257,11 @@ class AsyncLocalStorage {
 }
 
 runSyncAndReturn(store, callback, ...args) {
- const resource = executionAsyncResource();
- const outerStore = resource[this.kResourceStore];
- this.enterWith(store);
- try {
+ const resource = new AsyncResource('AsyncLocalStorage');
+ return resource.runInAsyncScope(() => {
+ this.enterWith(store);
 return callback(...args);
- } finally {
- resource[this.kResourceStore] = outerStore;
- }
+ });
 }
 
 exitSyncAndReturn(callback, ...args) {
@@ -287,11 +284,10 @@ class AsyncLocalStorage {
 }
 
 run(store, callback, ...args) {
- const resource = executionAsyncResource();
- const outerStore = resource[this.kResourceStore];
- this.enterWith(store);
- process.nextTick(callback, ...args);
- resource[this.kResourceStore] = outerStore;
+ process.nextTick(() => {
+ this.enterWith(store);
+ return callback(...args);
+ });
 }
 
 exit(callback, ...args) {
diff --git a/test/async-hooks/test-async-local-storage-run-resource.js b/test/async-hooks/test-async-local-storage-run-resource.js
@@ -0,0 +1,17 @@
+'use strict';
+require('../common');
+const assert = require('assert');
+const {
+ AsyncLocalStorage,
+ executionAsyncResource
+} = require('async_hooks');
+
+const asyncLocalStorage = new AsyncLocalStorage();
+
+const outerResource = executionAsyncResource();
+
+asyncLocalStorage.run(new Map(), () => {
+ assert.notStrictEqual(executionAsyncResource(), outerResource);
+});
+
+assert.strictEqual(executionAsyncResource(), outerResource);

-Original file line number
+Diff line change
+}
 runSyncAndReturn(store,callback, ...args){
 -constresource=executionAsyncResource();
 -constouterStore=resource[this.kResourceStore];
 -this.enterWith(store);
 -try{
 +constresource=newAsyncResource('AsyncLocalStorage');
 +returnresource.runInAsyncScope(()=>{
 +this.enterWith(store);
 returncallback(...args);
 -}finally{
 -resource[this.kResourceStore]=outerStore;
 -}
 +});
+}
 exitSyncAndReturn(callback, ...args){
+}
 run(store,callback, ...args){
 -constresource=executionAsyncResource();
 -constouterStore=resource[this.kResourceStore];
 -this.enterWith(store);
 -process.nextTick(callback, ...args);
 -resource[this.kResourceStore]=outerStore;
 +process.nextTick(()=>{
 +this.enterWith(store);
 +returncallback(...args);
 +});
+}
 exit(callback, ...args){
-Original file line number
+Diff line change
@@ @@ -0,0 +1,17 @@ @@
 +'use strict';
 +require('../common');
 +constassert=require('assert');
 +const{
 + AsyncLocalStorage,
 + executionAsyncResource
 +}=require('async_hooks');
++
 +constasyncLocalStorage=newAsyncLocalStorage();
++
 +constouterResource=executionAsyncResource();
++
 +asyncLocalStorage.run(newMap(),()=>{
 +assert.notStrictEqual(executionAsyncResource(),outerResource);
 +});
++
 +assert.strictEqual(executionAsyncResource(),outerResource);