fix: Close protocol response streams when aborted (#24656)

Co-authored-by: Paul Frazee <pfrazee@gmail.com>
electron · Jul 21, 2020 · d08e31c · d08e31c
1 parent b2449f3
commit d08e31c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/shell/browser/net/node_stream_loader.cc b/shell/browser/net/node_stream_loader.cc
@@ -42,6 +42,12 @@ NodeStreamLoader::~NodeStreamLoader() {
     node::MakeCallback(isolate_, emitter_.Get(isolate_), "removeListener",
                        node::arraysize(args), args, {0, 0});
   }
+
+  // Destroy the stream if not already ended
+  if (!ended_) {
+    node::MakeCallback(isolate_, emitter_.Get(isolate_), "destroy", 0, nullptr,
+                       {0, 0});
+  }
 }
 
 void NodeStreamLoader::Start(network::mojom::URLResponseHeadPtr head) {

diff --git a/spec-main/api-protocol-spec.ts b/spec-main/api-protocol-spec.ts
@@ -439,6 +439,30 @@ describe('protocol module', () => {
       ajax(protocolName + '://fake-host');
       await hasEndedPromise;
     });
+
+    it('destroys response streams when aborted before completion', async () => {
+      const events = new EventEmitter();
+      registerStreamProtocol(protocolName, (request, callback) => {
+        const responseStream = new stream.PassThrough();
+        responseStream.push('data\r\n');
+        responseStream.on('close', () => {
+          events.emit('close');
+        });
+        callback({
+          statusCode: 200,
+          headers: { 'Content-Type': 'text/plain' },
+          data: responseStream
+        });
+        events.emit('respond');
+      });
+
+      const hasRespondedPromise = emittedOnce(events, 'respond');
+      const hasClosedPromise = emittedOnce(events, 'close');
+      ajax(protocolName + '://fake-host');
+      await hasRespondedPromise;
+      await contents.loadFile(path.join(__dirname, 'fixtures', 'pages', 'jquery.html'));
+      await hasClosedPromise;
+    });
   });
 
   describe('protocol.isProtocolRegistered', () => {