Merge branch 'w/7.70/bugfix/CLDSRV-620/strip-trailing-checksums' into tmp/octopus/w/8.8/bugfix/CLDSRV-620/strip-trailing-checksums

Author: bert-e

lib/api/apiUtils/object/prepareStream.js

@@ -31,14 +31,14 @@ function prepareStream(stream, streamingV4Params, log, errCb) {
     return stream;
 }
 
-function stripTrailingChecksumStream(stream, log, errCb) {
-    // don't do anything if x-amz-trailer has not been set
-    if (stream.headers['x-amz-trailer'] === undefined ||
-        stream.headers['x-amz-trailer'] === '') {
+function stripTrailingChecksumStream(stream, log) {
+    // don't do anything if we are not in the correct integrity check mode
+    if (stream.headers['x-amz-content-sha256'] !==
+        'STREAMING-UNSIGNED-PAYLOAD-TRAILER') {
         return stream;
     }
 
-    const trailingChecksumTransform = new TrailingChecksumTransform(log, errCb);
+    const trailingChecksumTransform = new TrailingChecksumTransform(log);
     stream.pipe(trailingChecksumTransform);
     trailingChecksumTransform.headers = stream.headers;
     return trailingChecksumTransform;

lib/auth/streamingV4/trailingChecksumTransform.js

@@ -9,12 +9,10 @@ class TrailingChecksumTransform extends Transform {
     /**
      * @constructor
      * @param {object} log - logger object
-     * @param {function} errCb - callback called if an error occurs
      */
-    constructor(log, errCb) {
+    constructor(log) {
         super({});
         this.log = log;
-        this.errCb = errCb;
         this.chunkSizeBuffer = Buffer.alloc(0);
         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
@@ -53,7 +51,7 @@ class TrailingChecksumTransform extends Transform {
             const lineBreakIndex = chunk.indexOf('\r');
             if (lineBreakIndex === -1) {
                 if (this.chunkSizeBuffer.byteLength + chunk.byteLength > 10) {
-                    this.log.info('chunk size field too big', {
+                    this.log.error('chunk size field too big', {
                         chunkSizeBuffer: this.chunkSizeBuffer.toString(),
                         truncatedChunk: chunk.subarray(0, 16).toString(),
                     });
@@ -71,7 +69,7 @@ class TrailingChecksumTransform extends Transform {
 
             // chunk-size is sent in hex
             if (!/^[0-9a-fA-F]+$/.test(this.chunkSizeBuffer.toString())) {
-                this.log.info('chunk size is not a valid hex number', {
+                this.log.error('chunk size is not a valid hex number', {
                     chunkSizeBuffer: this.chunkSizeBuffer.toString(),
                 });
                 return callback(errors.InvalidArgument);
@@ -85,7 +83,7 @@ class TrailingChecksumTransform extends Transform {
             }
             this.chunkSizeBuffer = Buffer.alloc(0);
             if (dataSize === 0) {
-                // TODO: check if the checksum is correct
+                // TODO: check if the checksum is correct (S3C-9732)
                 // last chunk, no more data to read, the stream is closed
                 this.streamClosed = true;
             }