Skip to content

Commit 496e911

Browse files
committed
v2.3.10 修复签名 Expires 出错
1 parent 306d3d4 commit 496e911

File tree

2 files changed

+43
-41
lines changed

2 files changed

+43
-41
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cos-nodejs-sdk-v5",
3-
"version": "2.3.9",
3+
"version": "2.3.10",
44
"description": "cos nodejs sdk v5",
55
"main": "index.js",
66
"scripts": {

sdk/util.js

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -240,47 +240,49 @@ var apiWrapper = function (apiName, apiFn) {
240240
params = extend({}, params);
241241

242242
// 统一处理 Headers
243-
var Headers = params.Headers || {};
244-
if (params && typeof params === 'object') {
245-
(function () {
246-
for (var key in params) {
247-
if (params.hasOwnProperty(key) && key.indexOf('x-cos-') > -1) {
248-
Headers[key] = params[key];
243+
if (apiName !== 'getAuth' && apiName !== 'getObjectUrl') {
244+
var Headers = params.Headers || {};
245+
if (params && typeof params === 'object') {
246+
(function () {
247+
for (var key in params) {
248+
if (params.hasOwnProperty(key) && key.indexOf('x-cos-') > -1) {
249+
Headers[key] = params[key];
250+
}
249251
}
250-
}
251-
})();
252-
253-
// params headers
254-
Headers['x-cos-mfa'] = params['MFA'];
255-
Headers['Content-MD5'] = params['ContentMD5'];
256-
Headers['Content-Length'] = params['ContentLength'];
257-
Headers['Content-Type'] = params['ContentType'];
258-
Headers['Expect'] = params['Expect'];
259-
Headers['Expires'] = params['Expires'];
260-
Headers['Cache-Control'] = params['CacheControl'];
261-
Headers['Content-Disposition'] = params['ContentDisposition'];
262-
Headers['Content-Encoding'] = params['ContentEncoding'];
263-
Headers['Range'] = params['Range'];
264-
Headers['If-Modified-Since'] = params['IfModifiedSince'];
265-
Headers['If-Unmodified-Since'] = params['IfUnmodifiedSince'];
266-
Headers['If-Match'] = params['IfMatch'];
267-
Headers['If-None-Match'] = params['IfNoneMatch'];
268-
Headers['x-cos-copy-source'] = params['CopySource'];
269-
Headers['x-cos-copy-source-Range'] = params['CopySourceRange'];
270-
Headers['x-cos-metadata-directive'] = params['MetadataDirective'];
271-
Headers['x-cos-copy-source-If-Modified-Since'] = params['CopySourceIfModifiedSince'];
272-
Headers['x-cos-copy-source-If-Unmodified-Since'] = params['CopySourceIfUnmodifiedSince'];
273-
Headers['x-cos-copy-source-If-Match'] = params['CopySourceIfMatch'];
274-
Headers['x-cos-copy-source-If-None-Match'] = params['CopySourceIfNoneMatch'];
275-
Headers['x-cos-server-side-encryption'] = params['ServerSideEncryption'];
276-
Headers['x-cos-acl'] = params['ACL'];
277-
Headers['x-cos-grant-read'] = params['GrantRead'];
278-
Headers['x-cos-grant-write'] = params['GrantWrite'];
279-
Headers['x-cos-grant-full-control'] = params['GrantFullControl'];
280-
Headers['x-cos-grant-read-acp'] = params['GrantReadAcp'];
281-
Headers['x-cos-grant-write-acp'] = params['GrantWriteAcp'];
282-
Headers['x-cos-storage-class'] = params['StorageClass'];
283-
params.Headers = clearKey(Headers);
252+
})();
253+
254+
// params headers
255+
Headers['x-cos-mfa'] = params['MFA'];
256+
Headers['Content-MD5'] = params['ContentMD5'];
257+
Headers['Content-Length'] = params['ContentLength'];
258+
Headers['Content-Type'] = params['ContentType'];
259+
Headers['Expect'] = params['Expect'];
260+
Headers['Expires'] = params['Expires'];
261+
Headers['Cache-Control'] = params['CacheControl'];
262+
Headers['Content-Disposition'] = params['ContentDisposition'];
263+
Headers['Content-Encoding'] = params['ContentEncoding'];
264+
Headers['Range'] = params['Range'];
265+
Headers['If-Modified-Since'] = params['IfModifiedSince'];
266+
Headers['If-Unmodified-Since'] = params['IfUnmodifiedSince'];
267+
Headers['If-Match'] = params['IfMatch'];
268+
Headers['If-None-Match'] = params['IfNoneMatch'];
269+
Headers['x-cos-copy-source'] = params['CopySource'];
270+
Headers['x-cos-copy-source-Range'] = params['CopySourceRange'];
271+
Headers['x-cos-metadata-directive'] = params['MetadataDirective'];
272+
Headers['x-cos-copy-source-If-Modified-Since'] = params['CopySourceIfModifiedSince'];
273+
Headers['x-cos-copy-source-If-Unmodified-Since'] = params['CopySourceIfUnmodifiedSince'];
274+
Headers['x-cos-copy-source-If-Match'] = params['CopySourceIfMatch'];
275+
Headers['x-cos-copy-source-If-None-Match'] = params['CopySourceIfNoneMatch'];
276+
Headers['x-cos-server-side-encryption'] = params['ServerSideEncryption'];
277+
Headers['x-cos-acl'] = params['ACL'];
278+
Headers['x-cos-grant-read'] = params['GrantRead'];
279+
Headers['x-cos-grant-write'] = params['GrantWrite'];
280+
Headers['x-cos-grant-full-control'] = params['GrantFullControl'];
281+
Headers['x-cos-grant-read-acp'] = params['GrantReadAcp'];
282+
Headers['x-cos-grant-write-acp'] = params['GrantWriteAcp'];
283+
Headers['x-cos-storage-class'] = params['StorageClass'];
284+
params.Headers = clearKey(Headers);
285+
}
284286
}
285287

286288
// 代理回调函数

0 commit comments

Comments
 (0)