egg-oss - npm Package Compare versions

Comparing version 0.0.2 to 1.0.0

package.json

 {
   "name": "egg-oss",
-  "version": "0.0.2",
+  "version": "1.0.0",
   "description": "oss plugin for egg",
@@ -17,2 +17,3 @@ "eggPlugin": {
   "devDependencies": {
+    "ali-oss": "^4.4.4",
     "autod": "^2",
@@ -19,0 +20,0 @@ "co": "^4.6.0",

test/fixtures/apps/oss-agent/config/config.default.js

@@ -10,5 +10,5 @@ 'use strict';
 		endpoint: env.ALI_SDK_OSS_ENDPOINT,
-		bucket: env.ALI_SDK_OSS_BUCKET,
+		bucket: 'ali-oss-test-bucket-test99',
 	},
 	useAgent: true,
 };

test/fixtures/apps/oss-agent/logs/oss-agent/egg-agent.log

@@ -1,3 +0,3 @@
-2016-09-04 17:03:06,285 INFO 62360 [egg:watcher:agent] watcher start success
-2016-09-04 17:03:06,055 INFO 62360 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-agent/logs/oss-agent","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-agent/logs/oss-agent"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-agent-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"agent"}
-2016-09-04 17:03:06,066 INFO 62360 [egg:agent] create an AgentWorkerClient for "watcher"
[phone]:34:28,024 INFO 41498 [egg:watcher:agent] watcher start success
[phone]:34:27,808 INFO 41498 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-agent/logs/oss-agent","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-agent/logs/oss-agent"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-agent-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"agent"}
[phone]:34:27,817 INFO 41498 [egg:agent] create an AgentWorkerClient for "watcher"

test/fixtures/apps/oss-agent/logs/oss-agent/egg-web.log

@@ -1,10 +0,10 @@
-2016-09-04 17:03:06,833 INFO 62361 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-agent/logs/oss-agent","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-agent/logs/oss-agent"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-agent-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"application"}
-2016-09-04 17:03:06,835 INFO 62361 [egg:worker] create an AppWorkerClient for "watcher"
-2016-09-04 17:03:06,905 INFO 62361 [egg-schedule]: register schedule egg-schedule:/Users/adams/Documents/code/egg-oss-github/node_modules/egg/node_modules/egg-logrotator/app/schedule/rotate_by_file.js
-2016-09-04 17:03:07,100 INFO 62361 [egg-security] use csrf middleware
-2016-09-04 17:03:07,102 INFO 62361 [egg-security] use methodnoallow middleware
-2016-09-04 17:03:07,102 INFO 62361 [egg-security] use noopen middleware
-2016-09-04 17:03:07,103 INFO 62361 [egg-security] use nosniff middleware
-2016-09-04 17:03:07,104 INFO 62361 [egg-security] use xssProtection middleware
-2016-09-04 17:03:07,104 INFO 62361 [egg-security] use xframe middleware
-2016-09-04 17:03:07,104 INFO 62361 [egg-security] compose 6 middlewares into one security middleware
[phone]:34:28,765 INFO 41499 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-agent/logs/oss-agent","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-agent/logs/oss-agent"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-agent-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"application"}
[phone]:34:28,767 INFO 41499 [egg:worker] create an AppWorkerClient for "watcher"
[phone]:34:28,829 INFO 41499 [egg-schedule]: register schedule egg-schedule:/Users/adams/Documents/code/egg-oss-github/node_modules/egg/node_modules/egg-logrotator/app/schedule/rotate_by_file.js
[phone]:34:29,017 INFO 41499 [egg-security] use csrf middleware
[phone]:34:29,019 INFO 41499 [egg-security] use methodnoallow middleware
[phone]:34:29,019 INFO 41499 [egg-security] use noopen middleware
[phone]:34:29,020 INFO 41499 [egg-security] use nosniff middleware
[phone]:34:29,020 INFO 41499 [egg-security] use xssProtection middleware
[phone]:34:29,020 INFO 41499 [egg-security] use xframe middleware
[phone]:34:29,021 INFO 41499 [egg-security] compose 6 middlewares into one security middleware

test/fixtures/apps/oss-clients/app/router.js

@@ -7,5 +7,5 @@ 'use strict';
   app.get('/uploadtest', function*() {
-    const name = 'chair-oss-test-upload-' + process.version + '-' + Date.now();
+    const name = 'oss-test-upload-' + process.version + '-' + Date.now();
     this.body = yield this.oss.get('oss2').put(name, fs.createReadStream(__filename));
   });
 };

test/fixtures/apps/oss-clients/config/config.default.js

@@ -19,4 +19,4 @@ 'use strict';
     endpoint: env.ALI_SDK_OSS_ENDPOINT,
-    bucket:env.ALI_SDK_OSS_BUCKET
+    bucket:'ali-oss-test-bucket-test99'
   },
 };

test/fixtures/apps...-clients/logs/oss-clients/egg-agent.log

@@ -1,3 +0,3 @@
-2016-09-04 17:03:07,326 INFO 62358 [egg:watcher:agent] watcher start success
-2016-09-04 17:03:07,302 INFO 62358 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-clients/logs/oss-clients","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-clients/logs/oss-clients"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-clients-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"agent"}
-2016-09-04 17:03:07,302 INFO 62358 [egg:agent] create an AgentWorkerClient for "watcher"
[phone]:34:29,157 INFO 41496 [egg:watcher:agent] watcher start success
[phone]:34:29,127 INFO 41496 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-clients/logs/oss-clients","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-clients/logs/oss-clients"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-clients-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"agent"}
[phone]:34:29,130 INFO 41496 [egg:agent] create an AgentWorkerClient for "watcher"

test/fixtures/apps/oss-clients/logs/oss-clients/egg-web.log

@@ -1,10 +0,10 @@
-2016-09-04 17:03:07,341 INFO 62358 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-clients/logs/oss-clients","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-clients/logs/oss-clients"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-clients-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"application"}
-2016-09-04 17:03:07,341 INFO 62358 [egg:worker] create an AppWorkerClient for "watcher"
-2016-09-04 17:03:07,343 INFO 62358 [egg-schedule]: register schedule egg-schedule:/Users/adams/Documents/code/egg-oss-github/node_modules/egg/node_modules/egg-logrotator/app/schedule/rotate_by_file.js
-2016-09-04 17:03:07,351 INFO 62358 [egg-security] use csrf middleware
-2016-09-04 17:03:07,352 INFO 62358 [egg-security] use methodnoallow middleware
-2016-09-04 17:03:07,352 INFO 62358 [egg-security] use noopen middleware
-2016-09-04 17:03:07,352 INFO 62358 [egg-security] use nosniff middleware
-2016-09-04 17:03:07,352 INFO 62358 [egg-security] use xssProtection middleware
-2016-09-04 17:03:07,352 INFO 62358 [egg-security] use xframe middleware
-2016-09-04 17:03:07,352 INFO 62358 [egg-security] compose 6 middlewares into one security middleware
[phone]:34:29,172 INFO 41496 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-clients/logs/oss-clients","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-clients/logs/oss-clients"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-clients-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"application"}
[phone]:34:29,173 INFO 41496 [egg:worker] create an AppWorkerClient for "watcher"
[phone]:34:29,175 INFO 41496 [egg-schedule]: register schedule egg-schedule:/Users/adams/Documents/code/egg-oss-github/node_modules/egg/node_modules/egg-logrotator/app/schedule/rotate_by_file.js
[phone]:34:29,186 INFO 41496 [egg-security] use csrf middleware
[phone]:34:29,186 INFO 41496 [egg-security] use methodnoallow middleware
[phone]:34:29,186 INFO 41496 [egg-security] use noopen middleware
[phone]:34:29,186 INFO 41496 [egg-security] use nosniff middleware
[phone]:34:29,186 INFO 41496 [egg-security] use xssProtection middleware
[phone]:34:29,186 INFO 41496 [egg-security] use xframe middleware
[phone]:34:29,186 INFO 41496 [egg-security] compose 6 middlewares into one security middleware

test/fixtures/apps/oss-cluster/app/router.js

@@ -17,3 +17,3 @@ 'use strict';
   app.get('/uploadtest', function*() {
-    const name = 'chair-oss-test-upload-' + process.version + '-' + Date.now();
+    const name = 'oss-test-upload-' + process.version + '-' + Date.now();
     this.body = yield this.oss.put(name, fs.createReadStream(__filename));
@@ -29,3 +29,3 @@ });
     const stream = yield this.getFileStream();
-    const name = 'chair-multipart-test/' + process.version + '-' + Date.now() + '-' + path.basename(stream.filename);
+    const name = 'multipart-test/' + process.version + '-' + Date.now() + '-' + path.basename(stream.filename);
     // 文件处理，上传到云存储等等
@@ -32,0 +32,0 @@ const result = yield this.oss.put(name, stream);

test/fixtures/apps/oss-cluster/config/config.default.js

@@ -11,3 +11,3 @@ 'use strict';
       endpoint: env.ALI_SDK_OSS_ENDPOINT,
-      bucket: env.ALI_SDK_OSS_BUCKET
+      bucket: 'ali-oss-test-bucket-test99'
     }, {
@@ -17,5 +17,5 @@ accessKeyId: env.ALI_SDK_OSS_ID,
       endpoint: env.ALI_SDK_OSS_ENDPOINT,
-      bucket: env.ALI_SDK_OSS_BUCKET
+      bucket: 'ali-oss-test-bucket-test99'
     }]
   }
 };

test/fixtures/apps/oss-cluster/logs/oss/egg-agent.log

@@ -1,3 +0,3 @@
-2016-09-04 17:03:04,807 INFO 62358 [egg:watcher:agent] watcher start success
-2016-09-04 17:03:04,788 INFO 62358 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-cluster/logs/oss","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-cluster/logs/oss"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"agent"}
-2016-09-04 17:03:04,788 INFO 62358 [egg:agent] create an AgentWorkerClient for "watcher"
[phone]:34:26,937 INFO 41496 [egg:watcher:agent] watcher start success
[phone]:34:26,910 INFO 41496 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-cluster/logs/oss","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-cluster/logs/oss"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"agent"}
[phone]:34:26,911 INFO 41496 [egg:agent] create an AgentWorkerClient for "watcher"

test/fixtures/apps/oss-cluster/logs/oss/egg-web.log

@@ -1,10 +0,10 @@
-2016-09-04 17:03:04,819 INFO 62358 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-cluster/logs/oss","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-cluster/logs/oss"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"application"}
-2016-09-04 17:03:04,819 INFO 62358 [egg:worker] create an AppWorkerClient for "watcher"
-2016-09-04 17:03:04,820 INFO 62358 [egg-schedule]: register schedule egg-schedule:/Users/adams/Documents/code/egg-oss-github/node_modules/egg/node_modules/egg-logrotator/app/schedule/rotate_by_file.js
-2016-09-04 17:03:04,832 INFO 62358 [egg-security] use csrf middleware
-2016-09-04 17:03:04,833 INFO 62358 [egg-security] use methodnoallow middleware
-2016-09-04 17:03:04,833 INFO 62358 [egg-security] use noopen middleware
-2016-09-04 17:03:04,833 INFO 62358 [egg-security] use nosniff middleware
-2016-09-04 17:03:04,833 INFO 62358 [egg-security] use xssProtection middleware
-2016-09-04 17:03:04,833 INFO 62358 [egg-security] use xframe middleware
-2016-09-04 17:03:04,833 INFO 62358 [egg-security] compose 6 middlewares into one security middleware
[phone]:34:26,951 INFO 41496 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-cluster/logs/oss","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-cluster/logs/oss"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"application"}
[phone]:34:26,951 INFO 41496 [egg:worker] create an AppWorkerClient for "watcher"
[phone]:34:26,952 INFO 41496 [egg-schedule]: register schedule egg-schedule:/Users/adams/Documents/code/egg-oss-github/node_modules/egg/node_modules/egg-logrotator/app/schedule/rotate_by_file.js
[phone]:34:26,967 INFO 41496 [egg-security] use csrf middleware
[phone]:34:26,967 INFO 41496 [egg-security] use methodnoallow middleware
[phone]:34:26,967 INFO 41496 [egg-security] use noopen middleware
[phone]:34:26,967 INFO 41496 [egg-security] use nosniff middleware
[phone]:34:26,967 INFO 41496 [egg-security] use xssProtection middleware
[phone]:34:26,967 INFO 41496 [egg-security] use xframe middleware
[phone]:34:26,967 INFO 41496 [egg-security] compose 6 middlewares into one security middleware

test/fixtures/apps/oss-endpoint-http/app/router.js

@@ -17,3 +17,3 @@ 'use strict';
   app.get('/uploadtest', function*() {
-    const name = 'chair-oss-test-upload-' + process.version + '-' + Date.now();
+    const name = 'oss-test-upload-' + process.version + '-' + Date.now();
     this.body = yield this.oss.put(name, fs.createReadStream(__filename));
@@ -29,3 +29,3 @@ });
     const stream = yield this.getFileStream();
-    const name = 'chair-multipart-test/' + process.version + '-' + Date.now() + '-' + path.basename(stream.filename);
+    const name = 'multipart-test/' + process.version + '-' + Date.now() + '-' + path.basename(stream.filename);
     // 文件处理，上传到云存储等等
@@ -32,0 +32,0 @@ const result = yield this.oss.put(name, stream);

test/fixtures/apps...-endpoint-http/config/config.default.js

@@ -10,4 +10,4 @@ 'use strict';
 		endpoint: env.ALI_SDK_OSS_ENDPOINT,
-  		bucket:env.ALI_SDK_OSS_BUCKET
+  		bucket:'ali-oss-test-bucket-test99'
 	}
 };

test/fixtures/apps/oss-endpoint-http/logs/oss/egg-agent.log

@@ -1,3 +0,3 @@
-2016-09-04 17:03:04,095 INFO 62358 [egg:watcher:agent] watcher start success
-2016-09-04 17:03:04,062 INFO 62358 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-endpoint-http/logs/oss","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-endpoint-http/logs/oss"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"agent"}
-2016-09-04 17:03:04,063 INFO 62358 [egg:agent] create an AgentWorkerClient for "watcher"
[phone]:34:26,541 INFO 41496 [egg:watcher:agent] watcher start success
[phone]:34:26,508 INFO 41496 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-endpoint-http/logs/oss","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-endpoint-http/logs/oss"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"agent"}
[phone]:34:26,508 INFO 41496 [egg:agent] create an AgentWorkerClient for "watcher"

test/fixtures/apps/oss-endpoint-http/logs/oss/egg-web.log

@@ -1,10 +0,10 @@
-2016-09-04 17:03:04,111 INFO 62358 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-endpoint-http/logs/oss","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-endpoint-http/logs/oss"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"application"}
-2016-09-04 17:03:04,111 INFO 62358 [egg:worker] create an AppWorkerClient for "watcher"
-2016-09-04 17:03:04,113 INFO 62358 [egg-schedule]: register schedule egg-schedule:/Users/adams/Documents/code/egg-oss-github/node_modules/egg/node_modules/egg-logrotator/app/schedule/rotate_by_file.js
-2016-09-04 17:03:04,123 INFO 62358 [egg-security] use csrf middleware
-2016-09-04 17:03:04,123 INFO 62358 [egg-security] use methodnoallow middleware
-2016-09-04 17:03:04,123 INFO 62358 [egg-security] use noopen middleware
-2016-09-04 17:03:04,123 INFO 62358 [egg-security] use nosniff middleware
-2016-09-04 17:03:04,123 INFO 62358 [egg-security] use xssProtection middleware
-2016-09-04 17:03:04,124 INFO 62358 [egg-security] use xframe middleware
-2016-09-04 17:03:04,124 INFO 62358 [egg-security] compose 6 middlewares into one security middleware
[phone]:34:26,567 INFO 41496 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-endpoint-http/logs/oss","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-endpoint-http/logs/oss"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"application"}
[phone]:34:26,568 INFO 41496 [egg:worker] create an AppWorkerClient for "watcher"
[phone]:34:26,569 INFO 41496 [egg-schedule]: register schedule egg-schedule:/Users/adams/Documents/code/egg-oss-github/node_modules/egg/node_modules/egg-logrotator/app/schedule/rotate_by_file.js
[phone]:34:26,581 INFO 41496 [egg-security] use csrf middleware
[phone]:34:26,581 INFO 41496 [egg-security] use methodnoallow middleware
[phone]:34:26,582 INFO 41496 [egg-security] use noopen middleware
[phone]:34:26,582 INFO 41496 [egg-security] use nosniff middleware
[phone]:34:26,582 INFO 41496 [egg-security] use xssProtection middleware
[phone]:34:26,582 INFO 41496 [egg-security] use xframe middleware
[phone]:34:26,582 INFO 41496 [egg-security] compose 6 middlewares into one security middleware

test/fixtures/apps...missing-config/config/config.default.js

@@ -9,4 +9,4 @@ 'use strict';
 		endpoint: env.ALI_SDK_OSS_ENDPOINT,
-  		bucket:env.ALI_SDK_OSS_BUCKET
+  		bucket:'ali-oss-test-bucket-test99'
 	}
 };

test/fixtures/apps...ogs/oss-missing-config/common-error.log

@@ -1,2 +0,2 @@
-2016-09-04 17:03:04,226 ERROR 62358 nodejs.AssertionError: [egg-oss] Must set `accessKeyId` and `accessKeySecret` in oss's config
[phone]:34:26,697 ERROR 41496 nodejs.AssertionError: [egg-oss] Must set `accessKeyId` and `accessKeySecret` in oss's config
     at checkBucketConfig (/Users/adams/Documents/code/egg-oss-github/lib/oss.js:10:3)
@@ -22,4 +22,4 @@ at Singleton.create (/Users/adams/Documents/code/egg-oss-github/lib/oss.js:26:5)
 generatedMessage: false
-pid: 62358
+pid: 41496
 hostname: adamsdeMacBook-Pro.local
 

test/fixtures/apps...g/logs/oss-missing-config/egg-agent.log

@@ -1,3 +0,3 @@
-2016-09-04 17:03:04,191 INFO 62358 [egg:watcher:agent] watcher start success
-2016-09-04 17:03:04,162 INFO 62358 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-missing-config/logs/oss-missing-config","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-missing-config/logs/oss-missing-config"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-missing-config-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"agent"}
-2016-09-04 17:03:04,163 INFO 62358 [egg:agent] create an AgentWorkerClient for "watcher"
[phone]:34:26,661 INFO 41496 [egg:watcher:agent] watcher start success
[phone]:34:26,632 INFO 41496 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-missing-config/logs/oss-missing-config","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-missing-config/logs/oss-missing-config"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-missing-config-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"agent"}
[phone]:34:26,633 INFO 41496 [egg:agent] create an AgentWorkerClient for "watcher"

test/fixtures/apps...fig/logs/oss-missing-config/egg-web.log

@@ -1,3 +0,3 @@
-2016-09-04 17:03:04,209 INFO 62358 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-missing-config/logs/oss-missing-config","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-missing-config/logs/oss-missing-config"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-missing-config-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"application"}
-2016-09-04 17:03:04,209 INFO 62358 [egg:worker] create an AppWorkerClient for "watcher"
-2016-09-04 17:03:04,210 INFO 62358 [egg-schedule]: register schedule egg-schedule:/Users/adams/Documents/code/egg-oss-github/node_modules/egg/node_modules/egg-logrotator/app/schedule/rotate_by_file.js
[phone]:34:26,678 INFO 41496 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-missing-config/logs/oss-missing-config","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-missing-config/logs/oss-missing-config"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-missing-config-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"application"}
[phone]:34:26,679 INFO 41496 [egg:worker] create an AppWorkerClient for "watcher"
[phone]:34:26,680 INFO 41496 [egg-schedule]: register schedule egg-schedule:/Users/adams/Documents/code/egg-oss-github/node_modules/egg/node_modules/egg-logrotator/app/schedule/rotate_by_file.js

test/fixtures/apps/oss-not-init/config/config.default.js

@@ -9,3 +9,3 @@ 'use strict';
 	endpoint: env.ALI_SDK_OSS_ENDPOINT,
-  	bucket:env.ALI_SDK_OSS_BUCKET
+  	bucket:'ali-oss-test-bucket-test99'
 };
@@ -12,0 +12,0 @@

test/fixtures/apps...ot-init/logs/oss-not-init/egg-agent.log

@@ -1,3 +0,3 @@
-2016-09-04 17:03:04,550 INFO 62358 [egg:watcher:agent] watcher start success
-2016-09-04 17:03:04,531 INFO 62358 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-not-init/logs/oss-not-init","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-not-init/logs/oss-not-init"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-not-init-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"agent"}
-2016-09-04 17:03:04,532 INFO 62358 [egg:agent] create an AgentWorkerClient for "watcher"
[phone]:34:26,807 INFO 41496 [egg:watcher:agent] watcher start success
[phone]:34:26,789 INFO 41496 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-not-init/logs/oss-not-init","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-not-init/logs/oss-not-init"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-not-init-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"agent"}
[phone]:34:26,789 INFO 41496 [egg:agent] create an AgentWorkerClient for "watcher"

test/fixtures/apps...-not-init/logs/oss-not-init/egg-web.log

@@ -1,10 +0,10 @@
-2016-09-04 17:03:04,564 INFO 62358 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-not-init/logs/oss-not-init","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-not-init/logs/oss-not-init"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-not-init-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"application"}
-2016-09-04 17:03:04,564 INFO 62358 [egg:worker] create an AppWorkerClient for "watcher"
-2016-09-04 17:03:04,566 INFO 62358 [egg-schedule]: register schedule egg-schedule:/Users/adams/Documents/code/egg-oss-github/node_modules/egg/node_modules/egg-logrotator/app/schedule/rotate_by_file.js
-2016-09-04 17:03:04,576 INFO 62358 [egg-security] use csrf middleware
-2016-09-04 17:03:04,576 INFO 62358 [egg-security] use methodnoallow middleware
-2016-09-04 17:03:04,576 INFO 62358 [egg-security] use noopen middleware
-2016-09-04 17:03:04,576 INFO 62358 [egg-security] use nosniff middleware
-2016-09-04 17:03:04,576 INFO 62358 [egg-security] use xssProtection middleware
-2016-09-04 17:03:04,576 INFO 62358 [egg-security] use xframe middleware
-2016-09-04 17:03:04,576 INFO 62358 [egg-security] compose 6 middlewares into one security middleware
[phone]:34:26,822 INFO 41496 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-not-init/logs/oss-not-init","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss-not-init/logs/oss-not-init"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-not-init-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"application"}
[phone]:34:26,822 INFO 41496 [egg:worker] create an AppWorkerClient for "watcher"
[phone]:34:26,824 INFO 41496 [egg-schedule]: register schedule egg-schedule:/Users/adams/Documents/code/egg-oss-github/node_modules/egg/node_modules/egg-logrotator/app/schedule/rotate_by_file.js
[phone]:34:26,836 INFO 41496 [egg-security] use csrf middleware
[phone]:34:26,836 INFO 41496 [egg-security] use methodnoallow middleware
[phone]:34:26,836 INFO 41496 [egg-security] use noopen middleware
[phone]:34:26,836 INFO 41496 [egg-security] use nosniff middleware
[phone]:34:26,836 INFO 41496 [egg-security] use xssProtection middleware
[phone]:34:26,836 INFO 41496 [egg-security] use xframe middleware
[phone]:34:26,836 INFO 41496 [egg-security] compose 6 middlewares into one security middleware

test/fixtures/apps/oss/app/router.js

@@ -18,3 +18,3 @@ 'use strict';
   app.get('/uploadtest', function*() {
-    const name = 'chair-oss-test-upload-' + process.version + '-' + Date.now();
+    const name = 'oss-test-upload-' + process.version + '-' + Date.now();
     this.body = yield this.oss.put(name, fs.createReadStream(__filename));
@@ -29,3 +29,3 @@ });
     const stream = yield this.getFileStream();
-    const name = 'chair-multipart-test/' + process.version + '-' + Date.now() + '-' + path.basename(stream.filename);
+    const name = 'multipart-test/' + process.version + '-' + Date.now() + '-' + path.basename(stream.filename);
     // 文件处理，上传到云存储等等
@@ -32,0 +32,0 @@ const result = yield this.oss.put(name, stream);

test/fixtures/apps/oss/config/config.default.js

@@ -10,4 +10,4 @@ 'use strict';
 		endpoint: env.ALI_SDK_OSS_ENDPOINT,
-  		bucket:env.ALI_SDK_OSS_BUCKET
+		bucket: 'ali-oss-test-bucket-test99'
 	}
 };

test/fixtures/apps/oss/logs/oss/egg-agent.log

@@ -1,3 +0,3 @@
-2016-09-04 17:03:03,725 INFO 62358 [egg:watcher:agent] watcher start success
-2016-09-04 17:03:03,439 INFO 62358 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss/logs/oss","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss/logs/oss"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"agent"}
-2016-09-04 17:03:03,451 INFO 62358 [egg:agent] create an AgentWorkerClient for "watcher"
[phone]:34:26,122 INFO 41496 [egg:watcher:agent] watcher start success
[phone]:34:26,048 INFO 41496 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss/logs/oss","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss/logs/oss"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"agent"}
[phone]:34:26,055 INFO 41496 [egg:agent] create an AgentWorkerClient for "watcher"

test/fixtures/apps/oss/logs/oss/egg-web.log

@@ -1,10 +0,10 @@
-2016-09-04 17:03:03,926 INFO 62358 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss/logs/oss","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss/logs/oss"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"application"}
-2016-09-04 17:03:03,927 INFO 62358 [egg:worker] create an AppWorkerClient for "watcher"
-2016-09-04 17:03:03,941 INFO 62358 [egg-schedule]: register schedule egg-schedule:/Users/adams/Documents/code/egg-oss-github/node_modules/egg/node_modules/egg-logrotator/app/schedule/rotate_by_file.js
-2016-09-04 17:03:04,017 INFO 62358 [egg-security] use csrf middleware
-2016-09-04 17:03:04,019 INFO 62358 [egg-security] use methodnoallow middleware
-2016-09-04 17:03:04,020 INFO 62358 [egg-security] use noopen middleware
-2016-09-04 17:03:04,021 INFO 62358 [egg-security] use nosniff middleware
-2016-09-04 17:03:04,022 INFO 62358 [egg-security] use xssProtection middleware
-2016-09-04 17:03:04,022 INFO 62358 [egg-security] use xframe middleware
-2016-09-04 17:03:04,023 INFO 62358 [egg-security] compose 6 middlewares into one security middleware
[phone]:34:26,350 INFO 41496 [egg:logger] init all loggers with options: {"dir":"/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss/logs/oss","rotateLogDirs":["/Users/adams/Documents/code/egg-oss-github/test/fixtures/apps/oss/logs/oss"],"encoding":"utf8","env":"unittest","level":"INFO","consoleLevel":"WARN","outputJSON":false,"buffer":false,"appLogName":"oss-web.log","coreLogName":"egg-web.log","agentLogName":"egg-agent.log","errorLogName":"common-error.log","coreLogger":{},"type":"application"}
[phone]:34:26,351 INFO 41496 [egg:worker] create an AppWorkerClient for "watcher"
[phone]:34:26,374 INFO 41496 [egg-schedule]: register schedule egg-schedule:/Users/adams/Documents/code/egg-oss-github/node_modules/egg/node_modules/egg-logrotator/app/schedule/rotate_by_file.js
[phone]:34:26,466 INFO 41496 [egg-security] use csrf middleware
[phone]:34:26,469 INFO 41496 [egg-security] use methodnoallow middleware
[phone]:34:26,469 INFO 41496 [egg-security] use noopen middleware
[phone]:34:26,470 INFO 41496 [egg-security] use nosniff middleware
[phone]:34:26,471 INFO 41496 [egg-security] use xssProtection middleware
[phone]:34:26,472 INFO 41496 [egg-security] use xframe middleware
[phone]:34:26,472 INFO 41496 [egg-security] compose 6 middlewares into one security middleware

test/oss.test.js

@@ -6,3 +6,7 @@ 'use strict';
 const request = require('supertest');
-const urllib = require('urllib');
+const oss = require('ali-oss');
+const config = require('./fixtures/apps/oss/config/config.default').oss.client;
+const assert = require('assert');
+const env = process.env;
+const region = env.ALI_SDK_OSS_REGION || 'oss-cn-hangzhou';
 
@@ -14,3 +18,15 @@ describe('test/oss.test.js', () => {
     let lastUploadFileName;
-    before(() => {
+    before(function* () {
+      const ossConfig = {
+        accessKeyId: config.accessKeyId,
+        accessKeySecret: config.accessKeySecret,
+        endpoint: config.endpoint,
+        region,
+        callbackServer: 'http://d.rockuw.com:4567',
+      };
+      const store = oss(ossConfig);
+      const bucket = 'ali-oss-test-bucket-test99';
+      const result = yield store.putBucket(bucket, region);
+      assert.equal(result.bucket, bucket);
+      assert.equal(result.res.status, 200);
       app = mm.app({
@@ -20,2 +36,3 @@ baseDir: 'apps/oss',
       return app.ready();
+
     });
@@ -35,3 +52,3 @@
       ta.ready(function() {
-        ta.oss.options.endpoint.host.should.eql('oss-cn-hangzhou-zmf.aliyuncs.com');
+        ta.oss.options.endpoint.host.should.eql('oss-test.aliyun-inc.com');
         done();
@@ -60,9 +77,9 @@ });
       request(app.callback())
-      .get('/')
-      .expect({
-        app: true,
-        ctx: true,
-        putBucket: true,
-      })
-      .expect(200, done);
+        .get('/')
+        .expect({
+          app: true,
+          ctx: true,
+          putBucket: true,
+        })
+        .expect(200, done);
     });
@@ -73,14 +90,12 @@
       request(app.callback())
-      .get('/uploadtest')
-      .expect(function(res) {
-        lastUploadFileName = res.body.name;
-        res.body.name.should.be.a.String;
-        res.body.url.should.match(/^https?:\/\/alipay\-rmsdeploy\-dev\-assets\./);
-        // oss url 能够被访问到
-        urllib.request(res.body.url, function(err, _, res) {
-          res.status.should.equal(200);
-          done(err);
-        });
-      })
-      .expect(200, done);
+        .get('/uploadtest')
+        .expect(function(res) {
+          console.log(res.body);
+          lastUploadFileName = res.body.name;
+          res.body.name.should.be.a.String;
+          res.body.url.should.match(/^http:\/\/ali\-oss\-test\-bucket\-test99.oss\-test.aliyun\-inc.com/);
+          res.body.res.status.should.equal(200);
+          done();
+        })
+        .expect(200, done);
     });
@@ -95,14 +110,11 @@
         request(app.callback())
-        .get('/uploadtest')
-        .expect(function(res) {
-          lastUploadFileName = res.body.name;
-          res.body.name.should.be.a.String;
-          res.body.url.should.match(/^https?:\/\/alipay\-rmsdeploy\-dev\-assets\./);
-          // oss url 能够被访问到
-          urllib.request(res.body.url, function(err, _, res) {
-            res.status.should.equal(200);
-            done(err);
-          });
-        })
-        .expect(200, done);
+          .get('/uploadtest')
+          .expect(function(res) {
+            lastUploadFileName = res.body.name;
+            res.body.name.should.be.a.String;
+            res.body.url.should.match(/^http:\/\/ali\-oss\-test\-bucket\-test99.oss\-test.aliyun\-inc.com/);
+            res.body.res.status.should.equal(200);
+            done();
+          })
+          .expect(200, done);
       });
@@ -118,14 +130,11 @@ });
         request(app.callback())
-        .get('/uploadtest')
-        .expect(function(res) {
-          lastUploadFileName = res.body.name;
-          res.body.name.should.be.a.String;
-          res.body.url.should.match(/^https?:\/\/alipay\-rmsdeploy\-dev\-assets\./);
-          // oss url 能够被访问到
-          urllib.request(res.body.url, function(err, _, res) {
-            res.status.should.equal(200);
-            done(err);
-          });
-        })
-        .expect(200, done);
+          .get('/uploadtest')
+          .expect(function(res) {
+            lastUploadFileName = res.body.name;
+            res.body.name.should.be.a.String;
+            res.body.url.should.match(/^http:\/\/ali\-oss\-test\-bucket\-test99.oss\-test.aliyun\-inc.com/);
+            res.body.res.status.should.equal(200);
+            done();
+          })
+          .expect(200, done);
       });
@@ -175,16 +184,13 @@ });
       request(app.callback())
-      .get('/uploadtest')
-      .expect(function(res) {
-        lastUploadFileName = res.body.name;
-        res.body.name.should.be.a.String;
-        res.body.url.should.match(/^https?:\/\/alipay\-rmsdeploy\-dev\-assets\./);
-        // oss url 能够被访问到
-        urllib.request(res.body.url, function(err, _, res) {
-          res.status.should.equal(200);
-          done(err);
-        });
-      })
-      .expect(200, done);
+        .get('/uploadtest')
+        .expect(function(res) {
+          lastUploadFileName = res.body.name;
+          res.body.name.should.be.a.String;
+          res.body.url.should.match(/^http:\/\/ali\-oss\-test\-bucket\-test99.oss\-test.aliyun\-inc.com/);
+          res.body.res.status.should.equal(200);
+          done();
+        })
+        .expect(200, done);
     });
   });
 });

New alerts

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

URL strings

Supply chain risk

Package contains fragments of external URLs or IP addresses, which the package may be accessing at runtime.

Found 1 instance in 1 package

Fixed alerts

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

URL strings

Supply chain risk

Package contains fragments of external URLs or IP addresses, which the package may be accessing at runtime.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

3043852

0.01%

Lines of code

203291

0

Number of low quality alerts

0

-100%

Worsened metrics

Dev dependency count

13

8.33%

Number of low supply chain risk alerts

15

7.14%

No dependency changes