Refactor migration token validation and match entire token on endpoints #602
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
joshcanhelp
commented
Dec 14, 2018
| @@ -158,7 +158,7 @@ protected function getAuthorizationHeader() { | |||
| protected function migration_ws_login() { | |||
|
|
|||
| // Migration web service is not turned on. | |||
| if ( $this->a0_options->get( 'migration_ws' ) == 0 ) { | |||
| if ( ! $this->a0_options->get( 'migration_ws' ) ) { | |||
There was a problem hiding this comment.
More accurate checking for this setting.
joshcanhelp
force-pushed
the
improve-migration-ws-validation
branch
from
72385a1 to
7cb8902
Compare
joshcanhelp
commented
Dec 14, 2018
| @@ -173,18 +173,13 @@ protected function migration_ws_login() { | |||
| $authorization = $this->getAuthorizationHeader(); | |||
| $authorization = trim( str_replace( 'Bearer ', '', $authorization ) ); | |||
|
|
|||
| $secret = $this->a0_options->get_client_secret_as_key( true ); | |||
There was a problem hiding this comment.
Moved to $this->valid_token
joshcanhelp
commented
Dec 14, 2018
| @@ -223,7 +218,7 @@ protected function migration_ws_login() { | |||
| protected function migration_ws_get_user() { | |||
|
|
|||
| // Migration web service is not turned on. | |||
| if ( $this->a0_options->get( 'migration_ws' ) == 0 ) { | |||
There was a problem hiding this comment.
More accurate checking for this setting.
joshcanhelp
commented
Dec 14, 2018
| @@ -705,63 +706,51 @@ public function basic_validation( $old_options, $input ) { | |||
| return $input; | |||
| } | |||
|
|
|||
| public function migration_ws_validation( $old_options, $input ) { | |||
There was a problem hiding this comment.
Rewritten, probably best to review the final file.
joshcanhelp
force-pushed
the
improve-migration-ws-validation
branch
from
7cb8902 to
c31607f
Compare
joshcanhelp
commented
Dec 14, 2018
| @@ -237,21 +232,15 @@ protected function migration_ws_get_user() { | |||
|
|
|||
| $authorization = $this->getAuthorizationHeader(); | |||
| $authorization = trim( str_replace( 'Bearer ', '', $authorization ) ); | |||
|
|
|||
| $secret = $this->a0_options->get_client_secret_as_key( true ); | |||
There was a problem hiding this comment.
Moved to $this->valid_token
joshcanhelp
force-pushed
the
improve-migration-ws-validation
branch
from
c31607f to
224c436
Compare
Codecov Report
@@ Coverage Diff @@
## master #602 +/- ##
============================================
+ Coverage 33.19% 34.02% +0.82%
- Complexity 1313 1317 +4
============================================
Files 54 54
Lines 4191 4174 -17
============================================
+ Hits 1391 1420 +29
+ Misses 2800 2754 -46
Continue to review full report at Codecov.
|
joshcanhelp
changed the title
joshcanhelp
force-pushed
the
improve-migration-ws-validation
branch
from
224c436 to
9651ae4
Compare
cocojoe
reviewed
Dec 17, 2018
| * | ||
| * @return bool | ||
| */ | ||
| private function valid_token( $authorization ) { |
There was a problem hiding this comment.
It possible to end up in some kind of RS256 situation? or it can only ever be HS256?
There was a problem hiding this comment.
No. Original token was always created with HS256 but this new version compares char to char so the algorithm doesn't matter any longer.
cocojoe
approved these changes
Dec 18, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Changes
This PR makes changes to how the migration token is used for user migration scenarios:
jtiattribute.Testing
Checklist