fix: should use encodeURIComponent insteadof encodeURI in copy api (#914

)
ali-sdk · Dec 25, 2020 · 9dceb70 · 9dceb70
1 parent 3775dc4
commit 9dceb70
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/lib/common/object/copyObject.js b/lib/common/object/copyObject.js
@@ -67,7 +67,7 @@ proto._getSourceName = function _getSourceName(sourceName, bucketName) {
 
  _checkBucketName(bucketName);
 
- sourceName = encodeURI(sourceName);
+ sourceName = encodeURIComponent(sourceName);
 
  sourceName = `/${bucketName}/${sourceName}`;
  return sourceName;

diff --git a/test/browser/browser.test.js b/test/browser/browser.test.js
@@ -881,6 +881,17 @@ describe('browser', () => {
  info = await store.head(originname);
  assert.equal(info.res.headers['cache-control'], 'max-age=0, s-maxage=86400');
  });
+
+ it('should copy object with special characters such as ;,/?:@&=+$#', async () => {
+ const sourceName = `${prefix}ali-sdk/oss/copy-a;,/?:@&=+$#b.js`;
+ const fileContent = Array(1024 * 1024)
+ .fill('a')
+ .join('');
+ const file = new File([fileContent], sourceName);
+ await store.put(sourceName, file);
+ await store.copy(`${prefix}ali-sdk/oss/copy-a.js`, sourceName);
+ await store.copy(`${prefix}ali-sdk/oss/copy-a+b.js`, sourceName);
+ });
  });
 
  describe('signatureUrl()', () => {

diff --git a/test/node/object.test.js b/test/node/object.test.js
@@ -1512,6 +1512,14 @@ describe('test/object.test.js', () => {
  assert.equal(info.status, 200);
  });
 
+ it('should copy object with special characters such as ;,/?:@&=+$#', async () => {
+ const sourceName = `${prefix}ali-sdk/oss/copy-a;,/?:@&=+$#b.js`;
+ const tempFile = await utils.createTempFile('t', 1024 * 1024);
+ await store.put(sourceName, tempFile);
+ await store.copy(`${prefix}ali-sdk/oss/copy-a.js`, sourceName);
+ await store.copy(`${prefix}ali-sdk/oss/copy-a+b.js`, sourceName);
+ });
+
  it('should use copy to change exists object headers', async () => {
  const originname = `${prefix}ali-sdk/oss/copy-new-3.js`;
  let result = await store.copy(originname, name);
@@ -1997,13 +2005,11 @@ describe('test/object.test.js', () => {
  let keyCount = 0;
  do {
  // eslint-disable-next-line no-await-in-loop
- const result = await store.listV2(
- {
- prefix: listPrefix,
- 'max-keys': 2,
- 'continuation-token': nextContinuationToken,
- },
- );
+ const result = await store.listV2({
+ prefix: listPrefix,
+ 'max-keys': 2,
+ 'continuation-token': nextContinuationToken
+ });
  keyCount += result.keyCount;
  nextContinuationToken = result.nextContinuationToken;
  } while (nextContinuationToken);