Add PKCE support #658
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,8 @@ var promisify = require('promisify-any').use(Promise); | |
| var ServerError = require('../errors/server-error'); | ||
| var is = require('../validator/is'); | ||
| var util = require('util'); | ||
| var crypto = require('crypto'); | ||
| var stringUtil = require('../utils/string-util'); | ||
|
|
||
| /** | ||
| * Constructor. | ||
|
|
@@ -118,6 +120,34 @@ AuthorizationCodeGrantType.prototype.getAuthorizationCode = function(request, cl | |
| throw new InvalidGrantError('Invalid grant: `redirect_uri` is not a valid URI'); | ||
| } | ||
|
|
||
| if (code.codeChallenge) { | ||
| if (!request.body.code_verifier) { | ||
| throw new InvalidGrantError('Missing parameter: `code_verifier`'); | ||
| } | ||
|
|
||
| var hash; | ||
| switch(code.codeChallengeMethod) { | ||
| case 'plain': | ||
| hash = request.body.code_verifier; | ||
| break; | ||
| case 'S256': | ||
| hash = stringUtil.base64URLEncode(crypto.createHash('sha256').update(request.body.code_verifier).digest()); | ||
| break; | ||
| default: | ||
| throw new ServerError('Server error: `getAuthorizationCode()` did not return a valid `codeChallengeMethod` property'); | ||
| } | ||
|
|
||
| if (code.codeChallenge !== hash) { | ||
| throw new InvalidGrantError('Invalid grant: code verifier is invalid'); | ||
| } | ||
| } | ||
| else { | ||
| if (request.body.code_verifier) { | ||
| // No code challenge but code_verifier was passed in. | ||
| throw new InvalidGrantError('Invalid grant: code verifier is invalid'); | ||
| } | ||
| } | ||
|
|
||
| return code; | ||
| }); | ||
| }; | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -118,12 +118,13 @@ TokenHandler.prototype.handle = function(request, response) { | |
| TokenHandler.prototype.getClient = function(request, response) { | ||
| var credentials = this.getClientCredentials(request); | ||
| var grantType = request.body.grant_type; | ||
| var isPkce = this.isPKCERequest(request, grantType); | ||
|
|
||
| if (!credentials.clientId) { | ||
| throw new InvalidRequestError('Missing parameter: `client_id`'); | ||
| } | ||
|
|
||
| if (this.isClientAuthenticationRequired(grantType) && !credentials.clientSecret && !isPkce) { | ||
| throw new InvalidRequestError('Missing parameter: `client_secret`'); | ||
| } | ||
|
|
||
|
|
@@ -187,6 +188,12 @@ TokenHandler.prototype.getClientCredentials = function(request) { | |
| return { clientId: request.body.client_id, clientSecret: request.body.client_secret }; | ||
| } | ||
|
|
||
| if (this.isPKCERequest(request, grantType)) { | ||
| if(request.body.client_id) { | ||
| return { clientId: request.body.client_id }; | ||
| } | ||
| } | ||
|
|
||
| if (!this.isClientAuthenticationRequired(grantType)) { | ||
| if(request.body.client_id) { | ||
| return { clientId: request.body.client_id }; | ||
|
|
@@ -293,6 +300,17 @@ TokenHandler.prototype.isClientAuthenticationRequired = function(grantType) { | |
| } | ||
| }; | ||
|
|
||
| /** | ||
| * Check if the request is a PCKE request. We assume PKCE if grant type is 'authorization_code' | ||
| * and code verifier is present. | ||
| */ | ||
| TokenHandler.prototype.isPKCERequest = function(request, grantType) { | ||
| if (grantType === 'authorization_code' && request.body.code_verifier) { | ||
| return true; | ||
| } | ||
| return false; | ||
| }; | ||
|
|
||
| /** | ||
| * Export constructor. | ||
| */ | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
might be typo,