stream: stricter isReadableNodeStream

Fixes: #40938 PR-URL: #40941 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Nov 29, 2021 · 70bd90e · 70bd90e
1 parent 86d1c0b
commit 70bd90e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js
@@ -116,7 +116,7 @@ function eos(stream, options, callback) {
       return callback.call(stream, errored);
     }
 
-    if (readable && !readableFinished) {
+    if (readable && !readableFinished && isReadableNodeStream(stream, true)) {
       if (!isReadableFinished(stream, false))
         return callback.call(stream,
                              new ERR_STREAM_PREMATURE_CLOSE());

diff --git a/lib/internal/streams/utils.js b/lib/internal/streams/utils.js
@@ -9,11 +9,15 @@ const {
 const kDestroyed = Symbol('kDestroyed');
 const kIsDisturbed = Symbol('kIsDisturbed');
 
-function isReadableNodeStream(obj) {
+function isReadableNodeStream(obj, strict = false) {
   return !!(
     obj &&
     typeof obj.pipe === 'function' &&
     typeof obj.on === 'function' &&
+    (
+      !strict ||
+      (typeof obj.pause === 'function' && typeof obj.resume === 'function')
+    ) &&
     (!obj._writableState || obj._readableState?.readable !== false) && // Duplex
     (!obj._writableState || obj._readableState) // Writable has .pipe.
   );

diff --git a/test/parallel/test-stream-finished.js b/test/parallel/test-stream-finished.js
@@ -639,3 +639,20 @@ testClosed((opts) => new Writable({ write() {}, ...opts }));
   const s = new Stream();
   finished(s, common.mustNotCall());
 }
+
+{
+  const server = http.createServer(common.mustCall(function(req, res) {
+    fs.createReadStream(__filename).pipe(res);
+    finished(res, common.mustCall(function(err) {
+      assert.strictEqual(err, undefined);
+    }));
+  })).listen(0, function() {
+    http.request(
+      { method: 'GET', port: this.address().port },
+      common.mustCall(function(res) {
+        res.resume();
+        server.close();
+      })
+    ).end();
+  });
+}