Lint and rework SSE condition

Issue: CLDSRV-408
scality · Jul 6, 2023 · 4f4762f · 4f4762f
1 parent 646c3e2
commit 4f4762f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 30 deletions.
diff --git a/lib/api/apiUtils/object/versioning.js b/lib/api/apiUtils/object/versioning.js
@@ -456,11 +456,15 @@ function restoreMetadatas(objMD, metadataStoreParams) {
     if (objMD['x-amz-server-side-encryption']) {
         metadataStoreParams.cipherBundle = {
             algorithm: objMD['x-amz-server-side-encryption'],
-            masterKeyId: objMD['x-amz-server-side-encryption-aws-kms-key-id'] || objMD['x-amz-server-side-encryption-customer-algorithm'],
-        }
+            masterKeyId: objMD['x-amz-server-side-encryption-aws-kms-key-id'] ||
+            objMD['x-amz-server-side-encryption-customer-algorithm'],
+        };
     }
 
     if (objMD['x-amz-website-redirect-location']) {
+        if (!metadataStoreParams.headers) {
+            metadataStoreParams.headers = {};
+        }
         metadataStoreParams.headers['x-amz-website-redirect-location'] = objMD['x-amz-website-redirect-location'];
     }
 

diff --git a/lib/services.js b/lib/services.js
@@ -129,16 +129,10 @@ const services = {
             md.setLastModified(lastModifiedDate);
         }
 
-        if (!cipherBundle && params.cipherBundle) {
-            cipherBundle = params.cipherBundle;
-        }
-
-        if (cipherBundle) {
-            md.setAmzServerSideEncryption(cipherBundle.algorithm);
-            // configuredMasterKeyId takes precedence
-            if (cipherBundle.configuredMasterKeyId || cipherBundle.masterKeyId) {
-                md.setAmzEncryptionKeyId(cipherBundle.configuredMasterKeyId || cipherBundle.masterKeyId);
-            }
+        if (cipherBundle || params.cipherBundle) {
+            const bundle = cipherBundle || params.cipherBundle;
+            md.setAmzServerSideEncryption(bundle.algorithm);
+            md.setAmzEncryptionKeyId(bundle.configuredMasterKeyId || bundle.masterKeyId);
         }
         if (headers && headers['x-amz-website-redirect-location']) {
             md.setRedirectLocation(headers['x-amz-website-redirect-location']);

diff --git a/tests/functional/aws-node-sdk/test/object/objectCopy.js b/tests/functional/aws-node-sdk/test/object/objectCopy.js
@@ -1279,6 +1279,7 @@ describe('Object Copy', () => {
                 restoreCompletedAt: new Date(10),
                 restoreWillExpireAt: new Date(10 + (5 * 24 * 60 * 60 * 1000)),
             };
+            originalMetadata['custom-user-md'] = 'custom-md';
             fakeMetadataArchive(sourceBucketName, sourceObjName, undefined, archiveCompleted, err => {
                 assert.ifError(err);
                 s3.copyObject({

diff --git a/tests/functional/aws-node-sdk/test/utils/init.js b/tests/functional/aws-node-sdk/test/utils/init.js
@@ -81,28 +81,28 @@ function fakeMetadataArchive(bucketName, objectName, versionId, archive, cb) {
         objMD.archive = archive;
         objMD['x-amz-meta-custom-user-md'] = 'custom-md';
         objMD.tags = { tag1: 'value1', tag2: 'value2' };
-        objMD["x-amz-server-side-encryption"] = "AES256";
-		objMD["x-amz-server-side-encryption-aws-kms-key-id"] = "very-secret-key";
-        objMD['x-amz-website-redirect-location'] = 'https://scality.com/'
+        objMD['x-amz-server-side-encryption'] = 'AES256';
+        objMD['x-amz-server-side-encryption-aws-kms-key-id'] = 'very-secret-key';
+        objMD['x-amz-website-redirect-location'] = 'https://scality.com/';
         objMD.replicationInfo = {
-            "status" : "PENDING",
-            "backends" : [
+            'status': 'PENDING',
+            'backends': [
                     {
-                            "site" : "azure-normal",
-                            "status" : "PENDING",
-                            "dataStoreVersionId" : ""
+                            'site': 'azure-normal',
+                            'status': 'PENDING',
+                            'dataStoreVersionId': ''
                     }
             ],
-            "content" : [
-                    "DATA",
-                    "METADATA"
+            'content': [
+                    'DATA',
+                    'METADATA'
             ],
-            "destination" : "arn:aws:s3:::versioned",
-            "storageClass" : "azure-normal",
-            "role" : "arn:aws:iam::root:role/s3-replication-role",
-            "storageType" : "azure",
-            "dataStoreVersionId" : "",
-            "isNFS" : null
+            'destination': 'arn:aws:s3:::versioned',
+            'storageClass': 'azure-normal',
+            'role': 'arn:aws:iam::root:role/s3-replication-role',
+            'storageType': 'azure',
+            'dataStoreVersionId': '',
+            'isNFS': null
         };
         /* eslint-enable no-param-reassign */
         return metadata.putObjectMD(bucketName, objectName, objMD, { versionId: decodeVersionId(versionId) },

diff --git a/tests/unit/api/apiUtils/versioning.js b/tests/unit/api/apiUtils/versioning.js
@@ -648,7 +648,7 @@ describe('versioning helpers', () => {
                         'restoreRequestedDays': days,
                         'restoreRequestedAt': now,
                         archiveInfo
-                    } 
+                    }
                 },
                 expectedRes: {
                     'creationTime': now,