Merge branch 'improvement/CLDSRV-742' into q/9.1

Author: bert-e

lib/api/apiUtils/object/objectRestore.js

@@ -1,5 +1,5 @@
 const async = require('async');
-const { errors, s3middleware } = require('arsenal');
+const { errors, errorInstances, s3middleware } = require('arsenal');
 
 const { allowedRestoreObjectRequestTierValues } = require('../../../../constants');
 const coldStorage = require('./coldStorage');
@@ -87,9 +87,9 @@ function objectRestore(metadata, mdUtils, userInfo, request, log, callback) {
                     // If object metadata is delete marker,
                     // call back NoSuchKey or MethodNotAllowed depending on specifying versionId
                     if (objectMD.isDeleteMarker) {
-                        let err = errors.NoSuchKey;
+                        let err = errorInstances.NoSuchKey;
                         if (decodedVidResult) {
-                            err = errors.MethodNotAllowed;
+                            err = errorInstances.MethodNotAllowed;
                         }
                         log.trace('version is a delete marker', { method: METHOD, error: err });
                         return next(err, bucketMD, objectMD);

lib/api/objectPut.js

@@ -25,6 +25,9 @@ const { config } = require('../Config');
 const versionIdUtils = versioning.VersionID;
 const { updateEncryption } = require('./apiUtils/bucket/updateEncryption');
 
+const invalidSSEError = errorInstances.InvalidArgument.customizeDescription(
+    'The encryption method specified is not supported');
+
 /**
  * PUT Object in the requested bucket. Steps include:
  * validating metadata for authorization, bucket and object existence etc.
@@ -97,8 +100,6 @@ function objectPut(authInfo, request, streamingV4Params, log, callback) {
         return callback(errors.EntityTooLarge);
     }
 
-    const invalidSSEError = errorInstances.InvalidArgument.customizeDescription(
-        'The encryption method specified is not supported');
     const requestType = request.apiMethods || 'objectPut';
     const valParams = { authInfo, bucketName, objectKey, versionId,
         requestType, request, withVersionId: isPutVersion };

tests/unit/api/objectRestore.js

@@ -1,4 +1,5 @@
 const assert = require('assert');
+const sinon = require('sinon');
 
 const { bucketPut } = require('../../../lib/api/bucketPut');
 const objectPut = require('../../../lib/api/objectPut');
@@ -7,6 +8,7 @@ const { cleanup, DummyRequestLogger, makeAuthInfo } = require('../helpers');
 const mdColdHelper = require('./utils/metadataMockColdStorage');
 const DummyRequest = require('../DummyRequest');
 const metadata = require('../metadataswitch');
+const metadataUtils = require('../../../lib/metadata/metadataUtils');
 
 const log = new DummyRequestLogger();
 const authInfo = makeAuthInfo('accessKey1');
@@ -157,4 +159,57 @@ describe('restoreObject API', () => {
             });
         });
     });
+
+    it('should return NoSuchKey error when object is delete marker without versionId', done => {
+        const requestWithoutVersionId = objectRestoreRequest(objectRestoreXml);
+        const mockBucket = {
+            getName: () => bucketName,
+            getOwner: () => 'testCanonicalId',
+        };
+        const mockDeleteMarkerMD = mdColdHelper.getDeleteMarkerObjectMD();
+        const stub = sinon.stub(metadataUtils, 'standardMetadataValidateBucketAndObj');
+        stub.callsFake((params, denies, log, callback) => {
+            callback(null, mockBucket, mockDeleteMarkerMD);
+        });
+        objectRestore(authInfo, requestWithoutVersionId, log, err => {
+            stub.restore();
+            try {
+                assert(err, 'Expected an error');
+                assert.strictEqual(err.is.NoSuchKey, true);
+                assert.strictEqual(typeof err.customizeDescription, 'function',
+                    'Error should be from errorInstances which has customizeDescription method');
+                done();
+            } catch (assertionError) {
+                done(assertionError);
+            }
+        });
+    });
+
+    it('should return MethodNotAllowed error when object is delete marker with versionId', done => {
+        const requestWithVersionId = {
+            ...objectRestoreRequest(objectRestoreXml),
+            query: { versionId: 'null' },
+        };
+        const mockBucket = {
+            getName: () => bucketName,
+            getOwner: () => 'testCanonicalId',
+        };
+        const mockDeleteMarkerMD = mdColdHelper.getDeleteMarkerObjectMD();
+        const stub = sinon.stub(metadataUtils, 'standardMetadataValidateBucketAndObj');
+        stub.callsFake((params, denies, log, callback) => {
+            callback(null, mockBucket, mockDeleteMarkerMD);
+        });
+        objectRestore(authInfo, requestWithVersionId, log, err => {
+            stub.restore();
+            try {
+                assert(err, 'Expected an error');
+                assert.strictEqual(err.is.MethodNotAllowed, true);
+                assert.strictEqual(typeof err.customizeDescription, 'function',
+                    'Error should be from errorInstances which has customizeDescription method');
+                done();
+            } catch (assertionError) {
+                done(assertionError);
+            }
+        });
+    });
 });

tests/unit/api/utils/metadataMockColdStorage.js

@@ -182,12 +182,32 @@ function getExpiredObjectMD() {
     return getRestoredObjectMD(Date.now() - 10000);
 }
 
+/**
+ * Creates the object MD for a delete marker
+ * @param {string} [versionId] - optional version ID to set
+ * @returns {ObjectMD} the MD object
+ */
+function getDeleteMarkerObjectMD(versionId) {
+    const objectMD = new ObjectMD()
+        .setOwnerId(defaultOwnerId)
+        .setOwnerDisplayName('accessKey1displayName')
+        .setContentLength(0)
+        .setContentMd5('')
+        .setKey('objectName')
+        .setVersionId(versionId || 'deleteMarkerVersionId')
+        .setDataStoreName('mem');
+
+    objectMD.isDeleteMarker = true;
+    return objectMD;
+}
+
 module.exports = {
     putObjectMock,
     getArchivedObjectMD,
     getRestoringObjectMD,
     getRestoredObjectMD,
     getExpiredObjectMD,
+    getDeleteMarkerObjectMD,
     getTransitionInProgressObjectMD,
     putBucketMock,
     defaultLocation,