CORS 例子补充 ExposeHeaders Date

tencentyun · Dec 21, 2018 · 5b92012 · 5b92012
1 parent b090acc
commit 5b92012
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/demo/demo.js b/demo/demo.js
@@ -73,7 +73,7 @@ var cos = new COS({
         // xhr.send(JSON.stringify(options.Scope));
 
 
-        // // 方法三、后端使用固定密钥计算签名，返回给前端，auth.php，注意：后端需要通过 method、pathname 控制好权限，比如不允许 put / 等，这里暂不提供
+        // // 方法三、后端使用固定密钥计算签名，返回给前端，auth.php，注意：这种有安全风险，后端需要通过 method、pathname 控制好权限，比如不允许 put / 等，这里暂不提供
         // var method = (options.Method || 'get').toLowerCase();
         // var key = options.Key || '';
         // var query = options.Query || {};
@@ -262,7 +262,7 @@ function putBucketCors() {
                 "AllowedOrigin": ["*"],
                 "AllowedMethod": ["GET", "POST", "PUT", "DELETE", "HEAD"],
                 "AllowedHeader": ["*"],
-                "ExposeHeader": ["ETag", "Content-Length", "x-cos-acl", "x-cos-version-id", "x-cos-delete-marker", "x-cos-server-side-encryption"],
+                "ExposeHeader": ["ETag", "Date", "Content-Length", "x-cos-acl", "x-cos-version-id", "x-cos-delete-marker", "x-cos-server-side-encryption"],
                 "MaxAgeSeconds": "5"
             }]
         }

diff --git a/test/test.js b/test/test.js
@@ -222,6 +222,7 @@ group('mock readAsBinaryString', function () {
             onProgress: function (info) {
                 if (!paused && info.percent > 0.6) {
                     cos.cancelTask(TaskId);
+                    var hasProgress = false;
                     cos.sliceUploadFile({
                         Bucket: config.Bucket,
                         Region: config.Region,
@@ -237,6 +238,11 @@ group('mock readAsBinaryString', function () {
                             delete FileReader.prototype._readAsBinaryString;
                             done();
                         }
+                    }, function (err) {
+                        if (hasProgress) {
+                            assert.ok(false, '分片续传');
+                            done();
+                        }
                     });
                 }
             }
@@ -273,6 +279,7 @@ group('getAuth()', function () {
                         SecretKey: AuthData.TmpSecretKey,
                         Method: 'get',
                         Key: key,
+                        SystemClockOffset: cos.options.SystemClockOffset,
                     });
                 }
                 var link = 'http://' + config.Bucket + '.cos.' + config.Region + '.myqcloud.com' + '/' +
@@ -1304,20 +1311,20 @@ group('BucketCors', function () {
         "AllowedOrigins": ["*"],
         "AllowedMethods": ["GET", "POST", "PUT", "DELETE", "HEAD"],
         "AllowedHeaders": ["*", 'test-' + Date.now().toString(36)],
-        "ExposeHeaders": ["ETag", "Content-Length", "x-cos-acl", "x-cos-version-id", "x-cos-request-id", "x-cos-delete-marker", "x-cos-server-side-encryption"],
+        "ExposeHeaders": ["ETag", "Date", "Content-Length", "x-cos-acl", "x-cos-version-id", "x-cos-request-id", "x-cos-delete-marker", "x-cos-server-side-encryption"],
         "MaxAgeSeconds": "5"
     }];
     var CORSRulesMulti = [{
         "AllowedOrigins": ["*"],
         "AllowedMethods": ["GET", "POST", "PUT", "DELETE", "HEAD"],
         "AllowedHeaders": ["*"],
-        "ExposeHeaders": ["ETag", "Content-Length", "x-cos-acl", "x-cos-version-id", "x-cos-request-id", "x-cos-delete-marker", "x-cos-server-side-encryption"],
+        "ExposeHeaders": ["ETag", "Date", "Content-Length", "x-cos-acl", "x-cos-version-id", "x-cos-request-id", "x-cos-delete-marker", "x-cos-server-side-encryption"],
         "MaxAgeSeconds": "5"
     }, {
         "AllowedOrigins": ["http://qq.com", "http://qcloud.com"],
         "AllowedMethods": ["GET", "POST", "PUT", "DELETE", "HEAD"],
         "AllowedHeaders": ["*"],
-        "ExposeHeaders": ["ETag", "Content-Length", "x-cos-acl", "x-cos-version-id", "x-cos-request-id", "x-cos-delete-marker", "x-cos-server-side-encryption"],
+        "ExposeHeaders": ["ETag", "Date", "Content-Length", "x-cos-acl", "x-cos-version-id", "x-cos-request-id", "x-cos-delete-marker", "x-cos-server-side-encryption"],
         "MaxAgeSeconds": "5"
     }];
     test('putBucketCors(),getBucketCors()', function (done, assert) {