feat: checkBucketName in setBucket/initOption/useBucket (#709)

ali-sdk · Dec 19, 2019 · 162dfb5 · 162dfb5
1 parent 04fb6ba
commit 162dfb5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/lib/browser/bucket.js b/lib/browser/bucket.js
@@ -62,11 +62,13 @@ function toArray(obj) {
 // };
 
 proto.useBucket = function useBucket(name) {
+  this._checkBucketName(name);
   this.options.bucket = name;
   return this;
 };
 
 proto.setBucket = function useBucket(name) {
+  this._checkBucketName(name);
   this.options.bucket = name;
   return this;
 };

diff --git a/lib/bucket.js b/lib/bucket.js
@@ -73,6 +73,7 @@ proto.listBuckets = async function listBuckets(query, options) {
 };
 
 proto.useBucket = function useBucket(name) {
+  this._checkBucketName(name);
   return this.setBucket(name);
 };
 

diff --git a/lib/common/client/initOptions.js b/lib/common/client/initOptions.js
@@ -1,5 +1,6 @@
 const ms = require('humanize-ms');
 const urlutil = require('url');
+const _checkBucketName = require('../utils/checkBucketName');
 
 function setEndpoint(endpoint, secure) {
   let url = urlutil.parse(endpoint);
@@ -34,6 +35,9 @@ module.exports = function (options) {
     || !options.accessKeySecret) {
     throw new Error('require accessKeyId, accessKeySecret');
   }
+  if (!_checkBucketName(options.bucket)) {
+    throw new Error('The bucket must be conform to the specifications');
+  }
   const opts = Object.assign({
     region: 'oss-cn-hangzhou',
     internal: false,