zlib: validate flush king for all streams

Signed-off-by: Ic3b3rg <s.ceccarini94@gmail.com>
PR-URL: #63746Fixes: #63701
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: Ic3b3rg

lib/zlib.js

@@ -358,17 +358,10 @@ ZlibBase.prototype.flush = function(kind, callback) {
 kind=this._defaultFullFlushFlag;
 }
 
-// Reject kinds outside the brotli operation range. Otherwise the fake-chunk
-// path forwards an unsupported flush flag to the native encoder/decoder,
-// which spins at 100% CPU without making progress (see #63701).
-if(this._flushBoundIdx===FLUSH_BOUND_IDX_BROTLI){
-constmin=FLUSH_BOUND[FLUSH_BOUND_IDX_BROTLI][0];
-constmax=FLUSH_BOUND[FLUSH_BOUND_IDX_BROTLI][1];
-if(typeofkind!=='number'||NumberIsNaN(kind)||
-kind<min||kind>max){
-thrownewERR_OUT_OF_RANGE('kind',`>= ${min} and <= ${max}`,kind);
-}
-}
+kind=checkRangesOrGetDefault(
+kind,'kind',
+FLUSH_BOUND[this._flushBoundIdx][0],FLUSH_BOUND[this._flushBoundIdx][1],
+this._defaultFullFlushFlag);
 
 if(this.writableFinished){
 if(callback)

test/parallel/test-zlib-brotli-flush-invalid-kind.js

@@ -1,9 +1,7 @@
 'use strict';
-// Regression test for https://github.com/nodejs/node/issues/63701
-// BrotliCompress/BrotliDecompress.flush(kind) used to spin at 100% CPU when
-// kind was outside the brotli operation range (0..3) — e.g. Z_FINISH (4) or
-// Z_BLOCK (5). It must now throw ERR_OUT_OF_RANGE before reaching the native
-// layer.
+// Regression test for https://github.com/nodejs/node/issues/63701.
+// Invalid Brotli flush kinds used to spin in native code. flush(kind) should
+// reject invalid kinds before writing the fake flush chunk.
 
 require('../common');
 constassert=require('assert');
@@ -14,56 +12,81 @@ const {
 BROTLI_OPERATION_FLUSH,
 BROTLI_OPERATION_FINISH,
 BROTLI_OPERATION_EMIT_METADATA,
+Z_NO_FLUSH,
 Z_BLOCK,
 Z_FINISH,
+ ZSTD_e_continue,
+ ZSTD_e_flush,
+ ZSTD_e_end,
 }=zlib.constants;
 
-// Brotli operations 0..3 are valid and must not throw synchronously from
-// flush(). Some operations (e.g. FINISH on a decoder with no input) emit a
-// Z_BUF_ERROR asynchronously — that's expected and unrelated to the input
-// validation under test, so we attach a noop error handler.
-for(constvalidKindof[
-BROTLI_OPERATION_PROCESS,
-BROTLI_OPERATION_FLUSH,
-BROTLI_OPERATION_FINISH,
-BROTLI_OPERATION_EMIT_METADATA,
-]){
-constc=zlib.createBrotliCompress();
-c.on('error',()=>{});
-c.flush(validKind);
+constnoop=()=>{};
 
-constd=zlib.createBrotliDecompress();
-d.on('error',()=>{});
-d.flush(validKind);
-}
+constflushKindTestCases=[
+{
+factories: [zlib.createGzip],
+validKinds: [Z_NO_FLUSH,Z_FINISH,Z_BLOCK],
+invalidKinds: [-1,6,100],
+},
+{
+factories: [zlib.createBrotliCompress,zlib.createBrotliDecompress],
+validKinds: [
+BROTLI_OPERATION_PROCESS,
+BROTLI_OPERATION_FLUSH,
+BROTLI_OPERATION_FINISH,
+BROTLI_OPERATION_EMIT_METADATA,
+],
+invalidKinds: [-1,Z_FINISH,Z_BLOCK,6,100],
+},
+{
+factories: [zlib.createZstdCompress,zlib.createZstdDecompress],
+validKinds: [ZSTD_e_continue,ZSTD_e_flush,ZSTD_e_end],
+invalidKinds: [-1,3,Z_FINISH,Z_BLOCK,100],
+},
+];
 
-// Values outside [0, 3] must throw ERR_OUT_OF_RANGE for both compress and
-// decompress streams. Z_FINISH (4) and Z_BLOCK (5) previously hung at 100% CPU.
-constoutOfRange=[-1,Z_FINISH,Z_BLOCK,6,7,100];
+for(const{ factories, validKinds }offlushKindTestCases){
+for(constfactoryoffactories){
+for(constkindofvalidKinds){
+conststream=factory();
+stream.on('error',noop);
+stream.flush(kind);
+}
+}
+}
 
-for(constfactoryof[zlib.createBrotliCompress,zlib.createBrotliDecompress]){
-for(constkindofoutOfRange){
-assert.throws(
-()=>factory().flush(kind),
-{code: 'ERR_OUT_OF_RANGE',name: 'RangeError'},
-);
+for(const{ factories, invalidKinds }offlushKindTestCases){
+for(constfactoryoffactories){
+for(constkindofinvalidKinds){
+assert.throws(
+()=>factory().flush(kind),
+{code: 'ERR_OUT_OF_RANGE',name: 'RangeError'},
+);
+}
 }
 }
 
-// Non-number kinds must also throw, instead of silently triggering the
-// fake-chunk path with an undefined buffer.
-for(constfactoryof[zlib.createBrotliCompress,zlib.createBrotliDecompress]){
-for(constkindof['foobar',null,{},NaN]){
-assert.throws(
-()=>factory().flush(kind),
-{code: 'ERR_OUT_OF_RANGE'},
-);
+for(const{ factories }offlushKindTestCases){
+for(constfactoryoffactories){
+for(constkindof['foobar',null,{}]){
+assert.throws(
+()=>factory().flush(kind),
+{code: 'ERR_INVALID_ARG_TYPE',name: 'TypeError'},
+);
+}
 }
 }
 
-// flush() with no arguments (or with only a callback) must still work —
-// it uses the stream's _defaultFullFlushFlag, which is a valid brotli op.
-zlib.createBrotliCompress().flush();
-zlib.createBrotliCompress().flush(()=>{});
-zlib.createBrotliDecompress().flush();
-zlib.createBrotliDecompress().flush(()=>{});
+for(const{ factories }offlushKindTestCases){
+for(constfactoryoffactories){
+for(constkindof[undefined,NaN]){
+conststream=factory();
+stream.on('error',noop);
+stream.flush(kind);
+}
+
+conststream=factory();
+stream.on('error',noop);
+stream.flush(noop);
+}
+}