refactor: authorization refactor #387
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PeterRao
reviewed
Mar 15, 2018
lib/client.js
Outdated
| @@ -271,10 +272,15 @@ proto.createRequest = function createRequest(params) { | |||
| } | |||
|
|
|||
| var authResource = this._getResource(params); | |||
| headers.authorization = this.authorization( | |||
There was a problem hiding this comment.
this.authorization 是对外暴露的方法，需要进行同步。这个涉及对外 api 改动，参数为什么要变？
There was a problem hiding this comment.
这里还要重新设计下，对外暴露的方法基础上做封装
lib/common/signUtils.js
Outdated
| * @param {Object} request | ||
| * @param {String} expires | ||
| */ | ||
| exports.buildRtmpCanonicalString = function buildRtmpCanonicalString(canonicalizedResource, request, expires) { |
lib/common/signUtils.js
Outdated
| const crypto = require('crypto'); | ||
| const is = require('is-type-of'); | ||
|
|
||
| const SIGNED_PARAMETERS = ['acl', 'uploads', 'location', 'cors', 'logging', |
|
git commit log，描述好改动原因 |
binghaiwang
reviewed
Mar 19, 2018
lib/common/signUtils.js
Outdated
| @@ -0,0 +1,138 @@ | |||
| 'use strict'; | |||
|
|
|||
| const crypto = require('crypto'); | |||
There was a problem hiding this comment.
这里都用var, es5 es6不要混用, 以下类似的都要改
lib/common/signUtils.js
Outdated
| for (var key in headers) { | ||
| var lowerKey = key.toLowerCase(); | ||
| if (lowerKey === HEADER_CONTENT_TYPE | ||
| ||lowerKey === HEADER_CONTENT_MD5 |
There was a problem hiding this comment.
code format ||lowerKey === HEADER_CONTENT_MD5 需要空格隔开
lib/common/signUtils.js
Outdated
| for (var key in keys) { | ||
| var paramKey = keys[key]; | ||
| if (SIGNED_PARAMETERS.indexOf(paramKey) === -1) | ||
| { |
| */ | ||
| exports.authorization = function authorization(accessKeyId, accessKeySecret, canonicalString) { | ||
| return 'OSS ' + accessKeyId + ':' + this.computeSignature(accessKeySecret, canonicalString); | ||
| }; |
lib/client.js
Outdated
| @@ -271,10 +272,15 @@ proto.createRequest = function createRequest(params) { | |||
| } | |||
|
|
|||
| var authResource = this._getResource(params); | |||
| headers.authorization = this.authorization( | |||
There was a problem hiding this comment.
这里还要重新设计下，对外暴露的方法基础上做封装
Codecov Report
@@ Coverage Diff @@
## master #387 +/- ##
===========================================
- Coverage 96.56% 24.53% -72.04%
===========================================
Files 13 14 +1
Lines 1574 1598 +24
Branches 299 303 +4
===========================================
- Hits 1520 392 -1128
- Misses 54 1206 +1152
Continue to review full report at Codecov.
|
binghaiwang
reviewed
Mar 20, 2018
lib/common/signUtils.js
Outdated
| for (var key in keys) { | ||
| var paramKey = keys[key]; | ||
| if (SIGNED_PARAMETERS.indexOf(paramKey) === -1) | ||
| { | ||
| if (SIGNED_PARAMETERS.indexOf(paramKey) === -1) { |
There was a problem hiding this comment.
这里循环建议不使用continue, 新的eslint不建议使用，性能会提升, 将需要执行的代码放入if中
if (SIGNED_PARAMETERS.indexOf(paramKey) !== -1) {}
binghaiwang
reviewed
Mar 20, 2018
| var canonicalizedResource = '' + resourcePath; | ||
| var separatorString = '?'; | ||
|
|
||
| if (is.string(parameters) && parameters.trim() !== '') { |
There was a problem hiding this comment.
parameters 还要判断是否是数组 ， 之前逻辑有可能传进来是数组, 参照之前的Object.keys只是遍历对象 而不能对数组进行遍历, 这里排序放到最后做，先把需要签名的字段取出放入临时数组
This reverts commit 36c271a.
popomore
added a commit
that referenced
this pull request
Apr 3, 2018
* Revert "Create ISSUE_TEMPLATE.md" This reverts commit 53c024a. * Revert "chroe: build 4.14.1" This reverts commit 18f2f5e. * Revert "chore(release): 4.14.1" This reverts commit d3f6b13. * Revert "fix: signUtils header sort err fix (#418)" This reverts commit 60383ee. * Revert "chore: bump 4.14.0" This reverts commit a617866. * Revert "chore(release): 4.14.0" This reverts commit 4d3e7fe. * Revert "chore: remove the temp file" This reverts commit b9a2cec. * Revert "fix: _resumeMultipart not use yield" This reverts commit ba2382b. * Revert "fix(Browser): multipartUpload InvalidPartOrderError by doneParts repeat (#414)" This reverts commit 2b0967f. * Revert "feat: browser support blob (#409)" This reverts commit e8a78b5. * Revert "feat(browser): multipartUpload err will cancel this task (#399)" This reverts commit 64f8d68. * Revert "feat: signatureUrl refactor and support callback (#408)" This reverts commit 343938f. * Revert "chore: Delete example build file (#410)" This reverts commit 02b0efd. * Revert "feat: rm unused test data (#401)" This reverts commit 3d2ce4e. * Revert "feat: add ignore (#397)" This reverts commit 0f003aa. * Revert "refactor: add eslint for es6 (#382)" This reverts commit e3c1b54. * Revert "fix: issues #386 (#390)" This reverts commit 5b5ae3e. * Revert "refactor: authorization refactor (#387)" This reverts commit 59e245e. * Revert "feat: expose sdk version with OSS (#389)" This reverts commit 0bdc876.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
refactor: authorization refactor