fix: checkBucketName bug (#749)

Author: weiyie

lib/browser/bucket.js

@@ -77,16 +77,6 @@ proto.getBucket = function getBucket() {
   return this.options.bucket;
 };
 
-proto.putBucket = async function putBucket(name, options) {
-  const params = this._bucketRequestParams('PUT', name, '', options);
-  params.successStatuses = [200];
-  const result = await this.request(params);
-  return {
-    bucket: (result.headers.location && result.headers.location.substring(1)) || null,
-    res: result.res
-  };
-};
-
 proto.deleteBucket = async function deleteBucket(name, options) {
   const params = this._bucketRequestParams('DELETE', name, '', options);
   const result = await this.request(params);

lib/browser/client.js

@@ -16,7 +16,6 @@ const dateFormat = require('dateformat');
 const bowser = require('bowser');
 const signUtils = require('../common/signUtils');
 const _isIP = require('../common/utils/isIP');
-const _checkBucketName = require('../common/utils/checkBucketName');
 const _initOptions = require('../common/client/initOptions');
 
 const globalHttpAgent = new AgentKeepalive();
@@ -102,15 +101,7 @@ merge(proto, require('./object'));
 // /**
 //  * Bucket operations
 //  */
-/**
- * check Bucket Name
- */
 
-proto._checkBucketName = function (name) {
-  if (!_checkBucketName(name)) {
-    throw new Error('The bucket must be conform to the specifications');
-  }
-};
 // merge(proto, require('./bucket'));
 
 

lib/bucket.js

@@ -1,7 +1,6 @@
 
 
 const assert = require('assert');
-const _checkBucketName = require('./common/utils/checkBucketName');
 
 const proto = exports;
 
@@ -17,16 +16,6 @@ function toArray(obj) {
   return [obj];
 }
 
-/**
- * check Bucket Name
- */
-
-proto._checkBucketName = function (name) {
-  if (!_checkBucketName(name)) {
-    throw new Error('The bucket must be conform to the specifications');
-  }
-};
-
 /**
  * Bucket opertaions
  */
@@ -113,38 +102,6 @@ proto.getBucketInfo = async function getBucketInfo(name, options) {
   };
 };
 
-proto.putBucket = async function putBucket(name, options) {
-  this._checkBucketName(name);
-  options = options || {};
-  const params = this._bucketRequestParams('PUT', name, '', options);
-
-  const startTag = '<?xml version="1.0" encoding="UTF-8"?>\n<CreateBucketConfiguration>';
-  const endTag = '</CreateBucketConfiguration>';
-  let paramlXML = '';
-
-  // server not support
-  // if (region) {
-  //   paramlXML += `<LocationConstraint>${region}</LocationConstraint>`;
-  //   params.content = `${startTag}${paramlXML}${endTag}`;
-  // }
-
-  if (options.StorageClass) {
-    paramlXML += `<StorageClass>${options.StorageClass}</StorageClass>`;
-  }
-
-  if (paramlXML) {
-    params.mime = 'xml';
-    params.content = `${startTag}${paramlXML}${endTag}`;
-  }
-
-  params.successStatuses = [200];
-  const result = await this.request(params);
-  return {
-    bucket: (result.headers.location && result.headers.location.substring(1)) || null,
-    res: result.res
-  };
-};
-
 proto.deleteBucket = async function deleteBucket(name, options) {
   this._checkBucketName(name);
   const params = this._bucketRequestParams('DELETE', name, '', options);

lib/common/bucket/_checkBucketName.js

@@ -0,0 +1,9 @@
+const checkBucketName = require('../utils/checkBucketName');
+
+const proto = exports;
+
+proto._checkBucketName = function (name, createBucket) {
+  if (!checkBucketName(name, createBucket)) {
+    throw new Error('The bucket must be conform to the specifications');
+  }
+};

lib/common/bucket/index.js

@@ -10,3 +10,5 @@ merge(proto, require('./deleteBucketEncryption'));
 merge(proto, require('./getBucketTags'));
 merge(proto, require('./putBucketTags'));
 merge(proto, require('./deleteBucketTags'));
+merge(proto, require('./putBucket'));
+merge(proto, require('./_checkBucketName'));

lib/common/bucket/putBucket.js

@@ -0,0 +1,26 @@
+const proto = exports;
+const obj2xml = require('../utils/obj2xml');
+
+proto.putBucket = async function putBucket(name, options) {
+  this._checkBucketName(name, true);
+  options = options || {};
+  const params = this._bucketRequestParams('PUT', name, '', options);
+
+  const CreateBucketConfiguration = {};
+  const paramlXMLObJ = {
+    CreateBucketConfiguration
+  };
+
+  if (options.StorageClass) {
+    CreateBucketConfiguration.StorageClass = options.StorageClass;
+    params.mime = 'xml';
+    params.content = obj2xml(paramlXMLObJ, { headers: true });
+  }
+
+  params.successStatuses = [200];
+  const result = await this.request(params);
+  return {
+    bucket: (result.headers.location && result.headers.location.substring(1)) || null,
+    res: result.res
+  };
+};

lib/common/utils/checkBucketName.js

@@ -2,8 +2,8 @@
  * check Bucket Name
  */
 
-module.exports = function (name) {
-  const bucketRegex = /^[a-z0-9][a-z0-9-]{1,61}[a-z0-9]$/;
+module.exports = function (name, createBucket) {
+  const bucketRegex = createBucket ? /^[a-z0-9][a-z0-9-]{1,61}[a-z0-9]$/ : /^[a-z0-9_][a-z0-9-_]{1,61}[a-z0-9_]$/;
   const checkBucket = bucketRegex.test(name);
   return checkBucket;
 };

test/node/bucket.test.js

@@ -83,19 +83,13 @@ describe('test/bucket.test.js', () => {
       const result1 = await store.putBucket(name);
       assert.equal(result1.bucket, name);
       assert.equal(result1.res.status, 200);
-
-      // create a exists should work
-      const result2 = await store.putBucket(name);
-      assert.equal(result2.res.status, 200);
-      assert.equal(result2.bucket, name);
     });
 
     it('should create an archive bucket', async () => {
       await utils.sleep(ms(metaSyncTime));
       const result2 = await store.listBuckets();
       const { buckets } = result2;
       const m = buckets.some(item => item.name === archvieBucket);
-      console.log(buckets);
       assert(m === true);
       buckets.map((item) => {
         if (item.name === archvieBucket) {