Skip to content

Commit 0a3c64c

Browse files
weiyieweiyie
authored
fix: checkBucketName bug (#763)
1 parent 0ef0fe2 commit 0a3c64c

26 files changed

+74
-54
lines changed

‎lib/browser/bucket.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

22
const assert = require('assert');
3+
const _checkBucketName = require('../common/utils/checkBucketName');
34

45
const proto = exports;
56

@@ -62,13 +63,13 @@ function toArray(obj) {
6263
// };
6364

6465
proto.useBucket = function useBucket(name) {
65-
this._checkBucketName(name);
66+
_checkBucketName(name);
6667
this.options.bucket = name;
6768
return this;
6869
};
6970

7071
proto.setBucket = function useBucket(name) {
71-
this._checkBucketName(name);
72+
_checkBucketName(name);
7273
this.options.bucket = name;
7374
return this;
7475
};

‎lib/bucket.js

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
const assert = require('assert');
44
const isArray = require('./common/utils/isArray');
5+
const _checkBucketName = require('../lib/common/utils/checkBucketName');
56

67
const proto = exports;
78

@@ -58,12 +59,12 @@ proto.listBuckets = async function listBuckets(query, options) {
5859
};
5960

6061
proto.useBucket = function useBucket(name) {
61-
this._checkBucketName(name);
62+
_checkBucketName(name);
6263
return this.setBucket(name);
6364
};
6465

6566
proto.setBucket = function useBucket(name) {
66-
this._checkBucketName(name);
67+
_checkBucketName(name);
6768
this.options.bucket = name;
6869
return this;
6970
};
@@ -73,7 +74,7 @@ proto.getBucket = function getBucket() {
7374
};
7475

7576
proto.getBucketLocation = async function getBucketLocation(name, options) {
76-
this._checkBucketName(name);
77+
_checkBucketName(name);
7778
name = name || this.getBucket();
7879
const params = this._bucketRequestParams('GET', name, 'location', options);
7980
params.successStatuses = [200];
@@ -86,7 +87,7 @@ proto.getBucketLocation = async function getBucketLocation(name, options) {
8687
};
8788

8889
proto.getBucketInfo = async function getBucketInfo(name, options) {
89-
this._checkBucketName(name);
90+
_checkBucketName(name);
9091
name = name || this.getBucket();
9192
const params = this._bucketRequestParams('GET', name, 'bucketInfo', options);
9293
params.successStatuses = [200];
@@ -99,7 +100,7 @@ proto.getBucketInfo = async function getBucketInfo(name, options) {
99100
};
100101

101102
proto.deleteBucket = async function deleteBucket(name, options) {
102-
this._checkBucketName(name);
103+
_checkBucketName(name);
103104
const params = this._bucketRequestParams('DELETE', name, '', options);
104105
const result = await this.request(params);
105106
if (result.status === 200 || result.status === 204) {
@@ -113,7 +114,7 @@ proto.deleteBucket = async function deleteBucket(name, options) {
113114
// acl
114115

115116
proto.putBucketACL = async function putBucketACL(name, acl, options) {
116-
this._checkBucketName(name);
117+
_checkBucketName(name);
117118
const params = this._bucketRequestParams('PUT', name, 'acl', options);
118119
params.headers = {
119120
'x-oss-acl': acl
@@ -127,7 +128,7 @@ proto.putBucketACL = async function putBucketACL(name, acl, options) {
127128
};
128129

129130
proto.getBucketACL = async function getBucketACL(name, options) {
130-
this._checkBucketName(name);
131+
_checkBucketName(name);
131132
const params = this._bucketRequestParams('GET', name, 'acl', options);
132133
params.successStatuses = [200];
133134
params.xmlResponse = true;
@@ -145,7 +146,7 @@ proto.getBucketACL = async function getBucketACL(name, options) {
145146
// logging
146147

147148
proto.putBucketLogging = async function putBucketLogging(name, prefix, options) {
148-
this._checkBucketName(name);
149+
_checkBucketName(name);
149150
const params = this._bucketRequestParams('PUT', name, 'logging', options);
150151
let xml = `${'<?xml version="1.0" encoding="UTF-8"?>\n<BucketLoggingStatus>\n' +
151152
'<LoggingEnabled>\n<TargetBucket>'}${name}</TargetBucket>\n`;
@@ -163,7 +164,7 @@ proto.putBucketLogging = async function putBucketLogging(name, prefix, options)
163164
};
164165

165166
proto.getBucketLogging = async function getBucketLogging(name, options) {
166-
this._checkBucketName(name);
167+
_checkBucketName(name);
167168
const params = this._bucketRequestParams('GET', name, 'logging', options);
168169
params.successStatuses = [200];
169170
params.xmlResponse = true;
@@ -177,7 +178,7 @@ proto.getBucketLogging = async function getBucketLogging(name, options) {
177178
};
178179

179180
proto.deleteBucketLogging = async function deleteBucketLogging(name, options) {
180-
this._checkBucketName(name);
181+
_checkBucketName(name);
181182
const params = this._bucketRequestParams('DELETE', name, 'logging', options);
182183
params.successStatuses = [204, 200];
183184
const result = await this.request(params);
@@ -187,7 +188,7 @@ proto.deleteBucketLogging = async function deleteBucketLogging(name, options) {
187188
};
188189

189190
proto.putBucketCORS = async function putBucketCORS(name, rules, options) {
190-
this._checkBucketName(name);
191+
_checkBucketName(name);
191192
rules = rules || [];
192193
assert(rules.length, 'rules is required');
193194
rules.forEach((rule) => {
@@ -233,7 +234,7 @@ proto.putBucketCORS = async function putBucketCORS(name, rules, options) {
233234
};
234235

235236
proto.getBucketCORS = async function getBucketCORS(name, options) {
236-
this._checkBucketName(name);
237+
_checkBucketName(name);
237238
const params = this._bucketRequestParams('GET', name, 'cors', options);
238239
params.successStatuses = [200];
239240
params.xmlResponse = true;
@@ -257,7 +258,7 @@ proto.getBucketCORS = async function getBucketCORS(name, options) {
257258
};
258259

259260
proto.deleteBucketCORS = async function deleteBucketCORS(name, options) {
260-
this._checkBucketName(name);
261+
_checkBucketName(name);
261262
const params = this._bucketRequestParams('DELETE', name, 'cors', options);
262263
params.successStatuses = [204];
263264
const result = await this.request(params);
@@ -269,7 +270,7 @@ proto.deleteBucketCORS = async function deleteBucketCORS(name, options) {
269270
// referer
270271

271272
proto.putBucketReferer = async function putBucketReferer(name, allowEmpty, referers, options) {
272-
this._checkBucketName(name);
273+
_checkBucketName(name);
273274
const params = this._bucketRequestParams('PUT', name, 'referer', options);
274275
let xml = '<?xml version="1.0" encoding="UTF-8"?>\n<RefererConfiguration>\n';
275276
xml += ` <AllowEmptyReferer>${allowEmpty ? 'true' : 'false'}</AllowEmptyReferer>\n`;
@@ -293,7 +294,7 @@ proto.putBucketReferer = async function putBucketReferer(name, allowEmpty, refer
293294
};
294295

295296
proto.getBucketReferer = async function getBucketReferer(name, options) {
296-
this._checkBucketName(name);
297+
_checkBucketName(name);
297298
const params = this._bucketRequestParams('GET', name, 'referer', options);
298299
params.successStatuses = [200];
299300
params.xmlResponse = true;
@@ -312,7 +313,7 @@ proto.getBucketReferer = async function getBucketReferer(name, options) {
312313
};
313314

314315
proto.deleteBucketReferer = async function deleteBucketReferer(name, options) {
315-
this._checkBucketName(name);
316+
_checkBucketName(name);
316317
return await this.putBucketReferer(name, true, null, options);
317318
};
318319

‎lib/common/bucket/_checkBucketName.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎lib/common/bucket/deleteBucketEncryption.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
const _checkBucketName = require('../utils/checkBucketName');
2+
13
const proto = exports;
24
// const jstoxml = require('jstoxml');
35
/**
@@ -6,7 +8,7 @@ const proto = exports;
68
*/
79

810
proto.deleteBucketEncryption = async function deleteBucketEncryption(bucketName) {
9-
this._checkBucketName(bucketName);
11+
_checkBucketName(bucketName);
1012
const params = this._bucketRequestParams('DELETE', bucketName, 'encryption');
1113
params.successStatuses = [204];
1214
params.xmlResponse = true;

‎lib/common/bucket/deleteBucketLifecycle.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
const _checkBucketName = require('../utils/checkBucketName');
2+
13
const proto = exports;
24

35
proto.deleteBucketLifecycle = async function deleteBucketLifecycle(name, options) {
4-
this._checkBucketName(name);
6+
_checkBucketName(name);
57
const params = this._bucketRequestParams('DELETE', name, 'lifecycle', options);
68
params.successStatuses = [204];
79
const result = await this.request(params);

‎lib/common/bucket/deleteBucketPolicy.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
const _checkBucketName = require('../utils/checkBucketName');
2+
13
const proto = exports;
24
/**
35
* deleteBucketPolicy
@@ -6,7 +8,7 @@ const proto = exports;
68
*/
79

810
proto.deleteBucketPolicy = async function deleteBucketPolicy(bucketName, options = {}) {
9-
this._checkBucketName(bucketName);
11+
_checkBucketName(bucketName);
1012

1113
const params = this._bucketRequestParams('DELETE', bucketName, 'policy', options);
1214
params.successStatuses = [204];

‎lib/common/bucket/deleteBucketTags.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
const _checkBucketName = require('../utils/checkBucketName');
2+
13
const proto = exports;
24
/**
35
* deleteBucketTags
@@ -6,7 +8,7 @@ const proto = exports;
68
*/
79

810
proto.deleteBucketTags = async function deleteBucketTags(name, options = {}) {
9-
this._checkBucketName(name);
11+
_checkBucketName(name);
1012

1113
const params = this._bucketRequestParams('DELETE', name, 'tagging', options);
1214
params.successStatuses = [204];

‎lib/common/bucket/deleteBucketWebsite.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
const _checkBucketName = require('../utils/checkBucketName');
2+
13
const proto = exports;
24

35
proto.deleteBucketWebsite = async function deleteBucketWebsite(name, options) {
4-
this._checkBucketName(name);
6+
_checkBucketName(name);
57
const params = this._bucketRequestParams('DELETE', name, 'website', options);
68
params.successStatuses = [204];
79
const result = await this.request(params);

‎lib/common/bucket/getBucketEncryption.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
const _checkBucketName = require('../utils/checkBucketName');
2+
13
const proto = exports;
24
/**
35
* getBucketEncryption
46
* @param {String} bucketName - bucket name
57
*/
68

79
proto.getBucketEncryption = async function getBucketEncryption(bucketName) {
8-
this._checkBucketName(bucketName);
10+
_checkBucketName(bucketName);
911
const params = this._bucketRequestParams('GET', bucketName, 'encryption');
1012
params.successStatuses = [200];
1113
params.xmlResponse = true;

‎lib/common/bucket/getBucketLifecycle.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
const _checkBucketName = require('../utils/checkBucketName');
12
const isArray = require('../utils/isArray');
23
const formatObjKey = require('../utils/formatObjKey');
34

45
const proto = exports;
56

67
proto.getBucketLifecycle = async function getBucketLifecycle(name, options) {
7-
this._checkBucketName(name);
8+
_checkBucketName(name);
89
const params = this._bucketRequestParams('GET', name, 'lifecycle', options);
910
params.successStatuses = [200];
1011
params.xmlResponse = true;

0 commit comments

Comments
 (0)