review 2

Author: fredmnl

lib/auth/streamingV4/trailingChecksumTransform.js

@@ -16,7 +16,6 @@ class TrailingChecksumTransform extends Transform {
         this.log = log;
         this.errCb = errCb;
         this.chunkSizeBuffer = Buffer.alloc(0);
-        this.outputBuffer = [];
         this.bytesToDiscard = 0; // when trailing \r\n are present, we discard them but they can be in different chunks
         this.bytesToRead = 0; // when a chunk is advertised, the size is put here and we forward all bytes
         this.streamClosed = false;
@@ -42,7 +41,7 @@ class TrailingChecksumTransform extends Transform {
             // forward up to bytesToRead bytes from the chunk, restart processing on leftover
             if (this.bytesToRead > 0) {
                 const toRead = Math.min(this.bytesToRead, chunk.byteLength);
-                this.outputBuffer.push(chunk.subarray(0, toRead));
+                this.push(chunk.subarray(0, toRead));
                 chunk = chunk.subarray(toRead);
                 this.bytesToRead -= toRead;
                 if (this.bytesToRead === 0) {
@@ -64,13 +63,19 @@ class TrailingChecksumTransform extends Transform {
                 }
                 // no delimiter, we'll keep the chunk for later
                 this.chunkSizeBuffer = Buffer.concat([this.chunkSizeBuffer, chunk]);
-                break;
+                return callback();
             }
 
             this.chunkSizeBuffer = Buffer.concat([this.chunkSizeBuffer, chunk.subarray(0, lineBreakIndex2)]);
             chunk = chunk.subarray(lineBreakIndex2);
 
             // chunk-size is sent in hex
+            if (!/^[0-9a-fA-F]+$/.test(this.chunkSizeBuffer.toString())) {
+                this.log.debug('chunk size is not a valid hex number', {
+                    chunkSizeBuffer: this.chunkSizeBuffer.toString('hex'),
+                });
+                return callback(errors.InvalidArgument);
+            }
             const dataSize = Number.parseInt(this.chunkSizeBuffer.toString(), 16);
             if (Number.isNaN(dataSize)) {
                 this.log.debug('unable to parse chunk size', {
@@ -88,10 +93,7 @@ class TrailingChecksumTransform extends Transform {
             this.bytesToDiscard = 2;
         }
 
-        // TODO: push the stream into a checksum accumulator
-        const toFlush = Buffer.concat(this.outputBuffer);
-        this.outputBuffer = [];
-        return callback(null, toFlush, encoding);
+        return callback();
     }
 }
 

tests/unit/auth/TrailingChecksumTransform.js

@@ -106,4 +106,26 @@ describe('TrailingChecksumTransform class', () => {
             });
         });
     });
+
+    it('should correctly remove checksums, cut at each individual byte', done => {
+        const trailingChecksumTransform = new TrailingChecksumTransform(log, err => {
+            assert.strictEqual(err, null);
+        });
+        const chunks = [];
+        for (let i = 0; i < objDataWithTrailingChecksum.length - 1; i++) {
+            chunks.push(objDataWithTrailingChecksum.substring(i, i + 1));
+        }
+        const chunkedReader = new ChunkedReader(chunks);
+        chunkedReader.pipe(trailingChecksumTransform);
+        const outputChunks = [];
+        trailingChecksumTransform.on('data', (chunk) => outputChunks.push(Buffer.from(chunk)));
+        trailingChecksumTransform.on('finish', () => {
+            const data = Buffer.concat(outputChunks).toString();
+            assert.strictEqual(data, objDataWithoutTrailingChecksum);
+            done();
+        });
+        trailingChecksumTransform.on('error', err => {
+            assert.ifError(err);
+        });
+    });
 });