CLDSRV-636: Migrate SSE on object(Get|Head|Put)

Author: BourgoisMickael

lib/api/objectGet.js

@@ -13,6 +13,7 @@ const { metadataValidateBucketAndObj } = require('../metadata/metadataUtils');
 const monitoring = require('../utilities/metrics');
 const { getPartCountFromMd5 } = require('./apiUtils/object/partInfo');
 const { setExpirationHeaders } = require('./apiUtils/object/expirationHeaders');
+const { updateEncryption } = require('./apiUtils/bucket/updateEncryption');
 
 const validateHeaders = s3middleware.validateConditionalHeaders;
 
@@ -51,6 +52,7 @@ function objectGet(authInfo, request, returnTagCount, log, callback) {
     };
 
     return metadataValidateBucketAndObj(mdValParams, log,
+    (err, bucket, objMD) => updateEncryption(err, bucket, objMD, objectKey, log, {},
     (err, bucket, objMD) => {
         const corsHeaders = collectCorsHeaders(request.headers.origin,
             request.method, bucket);
@@ -255,7 +257,7 @@ function objectGet(authInfo, request, returnTagCount, log, callback) {
             return callback(null, dataLocator, responseMetaHeaders,
                 byteRange);
         });
-    });
+    }));
 }
 
 module.exports = objectGet;

lib/api/objectHead.js

@@ -14,6 +14,7 @@ const { getPartNumber, getPartSize, getPartCountFromMd5 } =
 const { metadataValidateBucketAndObj } = require('../metadata/metadataUtils');
 const { maximumAllowedPartCount } = require('../../constants');
 const { setExpirationHeaders } = require('./apiUtils/object/expirationHeaders');
+const { updateEncryption } = require('./apiUtils/bucket/updateEncryption');
 
 /**
  * HEAD Object - Same as Get Object but only respond with headers
@@ -51,6 +52,7 @@ function objectHead(authInfo, request, log, callback) {
     };
 
     return metadataValidateBucketAndObj(mdValParams, log,
+        (err, bucket, objMD) => updateEncryption(err, bucket, objMD, objectKey, log, {},
         (err, bucket, objMD) => {
             const corsHeaders = collectCorsHeaders(request.headers.origin,
                 request.method, bucket);
@@ -160,7 +162,7 @@ function objectHead(authInfo, request, log, callback) {
             });
             monitoring.promMetrics('HEAD', bucketName, '200', 'headObject');
             return callback(null, responseHeaders);
-        });
+        }));
 }
 
 module.exports = objectHead;

lib/api/objectPut.js

@@ -19,6 +19,7 @@ const validateChecksumHeaders = require('./apiUtils/object/validateChecksumHeade
 
 const writeContinue = require('../utilities/writeContinue');
 const versionIdUtils = versioning.VersionID;
+const { updateEncryption } = require('./apiUtils/bucket/updateEncryption');
 
 /**
  * PUT Object in the requested bucket. Steps include:
@@ -79,6 +80,7 @@ function objectPut(authInfo, request, streamingV4Params, log, callback) {
     log.trace('owner canonicalID to send to data', { canonicalID });
 
     return metadataValidateBucketAndObj(valParams, log,
+    (err, bucket, objMD) => updateEncryption(err, bucket, objMD, objectKey, log, { skipObject: true },
     (err, bucket, objMD) => {
         const responseHeaders = collectCorsHeaders(headers.origin,
             method, bucket);
@@ -202,7 +204,7 @@ function objectPut(authInfo, request, streamingV4Params, log, callback) {
                 null, ingestSize);
             return callback(null, responseHeaders);
         });
-    });
+    }));
 }
 
 module.exports = objectPut;