escape format marker when stringifying versionID

Issue: ARSN-502

Author: Kerkesni

lib/storage/metadata/in_memory/metastore.js

@@ -110,7 +110,7 @@ const metastore = {
                     // eslint-disable-next-line
                     objName = formatVersionKey(objName, params.versionId);
                     metadata.keyMaps.get(bucketName).set(objName, objVal);
-                    return cb(null, `{"versionId":"${objVal.versionId}"}`);
+                    return cb(null, `{"versionId":${JSON.stringify(objVal.versionId)}}`);
                 }
                 if (params && params.versioning) {
                     const versionId = generateVersionId();
@@ -119,13 +119,13 @@ const metastore = {
                     // eslint-disable-next-line
                     objName = formatVersionKey(objName, versionId);
                     metadata.keyMaps.get(bucketName).set(objName, objVal);
-                    return cb(null, `{"versionId":"${versionId}"}`);
+                    return cb(null, `{"versionId":${JSON.stringify(versionId)}}`);
                 }
                 if (params && params.versionId === '') {
                     const versionId = generateVersionId();
                     objVal.versionId = versionId; // eslint-disable-line
                     metadata.keyMaps.get(bucketName).set(objName, objVal);
-                    return cb(null, `{"versionId":"${objVal.versionId}"}`);
+                    return cb(null, `{"versionId":${JSON.stringify(versionId)}}`);
                 }
                 metadata.keyMaps.get(bucketName).set(objName, objVal);
                 return cb(null);

lib/storage/metadata/mongoclient/MongoClientInterface.ts

@@ -866,7 +866,7 @@ class MongoClientInterface {
         c.bulkWrite(ops, {
             ordered: true,
         })
-            .then(() => cb(null, `{"versionId": "${versionId}"}`))
+            .then(() => cb(null, `{"versionId": ${JSON.stringify(versionId)}}`))
             .catch((err: MongoBulkWriteError) => {
                 /*
                  * Previously related to https://jira.mongodb.org/browse/SERVER-14322
@@ -902,7 +902,7 @@ class MongoClientInterface {
                     // This error is expected, it means that two differents version were
                     // put at the same time.
                     if (isMasterOpError) {
-                        return cb(null, `{"versionId": "${versionId}"}`);
+                        return cb(null, `{"versionId": ${JSON.stringify(versionId)}}`);
                     }
 
                     // If no upserts succeeded and this is not a retry yet, try again with a new version ID
@@ -958,7 +958,7 @@ class MongoClientInterface {
             { $set: { value: objVal }, $setOnInsert: { _id: masterKey } },
             { upsert: true },
         )
-            .then(() => cb(null, `{"versionId": "${objVal.versionId}"}`))
+            .then(() => cb(null, `{"versionId": ${JSON.stringify(objVal.versionId)}}`))
             .catch((err) => {
                 log.error('putObjectVerCase2: error putting object version', { error: err.message });
                 return cb(errors.InternalError);
@@ -1003,7 +1003,7 @@ class MongoClientInterface {
             c.bulkWrite(ops, {
                 ordered: true,
             })
-                .then(() => callback(null, `{"versionId": "${objVal.versionId}"}`))
+                .then(() => callback(null, `{"versionId": ${JSON.stringify(objVal.versionId)}}`))
                 .catch(err => {
                     log.error('putObjectVerCase3: error putting object version', { error: err.message });
                     if (err.code === 11000) {
@@ -1158,12 +1158,12 @@ class MongoClientInterface {
             ops.push(masterOp);
             return c.bulkWrite(ops, {
                 ordered: true,
-            }).then(() => cb(null, `{"versionId": "${objVal.versionId}"}`)).catch((err) => {
+            }).then(() => cb(null, `{"versionId": ${JSON.stringify(objVal.versionId)}}`)).catch((err) => {
                 // we accept that the update fails if
                 // condition is not met, meaning that a more
                 // recent master was already in place
                 if (err.code === 11000) {
-                    return cb(null, `{"versionId": "${objVal.versionId}"}`);
+                    return cb(null, `{"versionId": ${JSON.stringify(objVal.versionId)}}`);
                 }
                 log.error('putObjectVerCase4: error upserting master', { error: err.message });
                 return cb(errors.InternalError);

lib/versioning/VersioningRequestProcessor.ts

@@ -393,7 +393,7 @@ export default class VersioningRequestProcessor {
                 return callback(err);
             }
             return this.writeCache.batch({ db, array, options },
-                logger, err => callback(err, `{"versionId":"${vid}"}`));
+                logger, err => callback(err, `{"versionId":${JSON.stringify(vid)}}`));
         };
 
         if (versionId) {
@@ -618,7 +618,7 @@ export default class VersioningRequestProcessor {
                     return callback(err);
                 }
                 return this.writeCache.batch({ db, array }, logger,
-                    err => callback(err, `{"versionId":"${vid}"}`));
+                    err => callback(err, `{"versionId":${JSON.stringify(vid)}}`));
             });
     }
 

tests/unit/versioning/VersionID.spec.js

@@ -32,6 +32,7 @@ describe('test generating versionIds', () => {
             assert.strictEqual(decoded.message, 'Non-base62 character');
         });
     });
+
     describe('legacy hex encoding', () => {
         VID.S3_VERSION_ID_ENCODING_TYPE = 'hex';
         const vids = generateRandomVIDs(count);