Skip to content
This repository has been archived by the owner on Jul 31, 2024. It is now read-only.

Update authorization code validation to do client binding check before deleting the code in the store #4501

Merged
merged 1 commit into from
Jun 11, 2020
Merged

Update authorization code validation to do client binding check before deleting the code in the store #4501

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions src/IdentityServer4/src/Validation/Default/TokenRequestValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,18 @@ private async Task<TokenRequestValidationResult> ValidateAuthorizationCodeReques
LogError("Invalid authorization code", new { code });
return Invalid(OidcConstants.TokenErrors.InvalidGrant);
}

/////////////////////////////////////////////
// validate client binding
/////////////////////////////////////////////
if (authZcode.ClientId != _validatedRequest.Client.ClientId)
{
LogError("Client is trying to use a code from a different client", new { clientId = _validatedRequest.Client.ClientId, codeClient = authZcode.ClientId });
return Invalid(OidcConstants.TokenErrors.InvalidGrant);
}

// remove code from store
// todo: set to consumed in the future?
await _authorizationCodeStore.RemoveAuthorizationCodeAsync(code);

if (authZcode.CreationTime.HasExceeded(authZcode.Lifetime, _clock.UtcNow.UtcDateTime))
Expand All @@ -252,15 +263,6 @@ private async Task<TokenRequestValidationResult> ValidateAuthorizationCodeReques
_validatedRequest.SessionId = authZcode.SessionId;
}

/////////////////////////////////////////////
// validate client binding
/////////////////////////////////////////////
if (authZcode.ClientId != _validatedRequest.Client.ClientId)
{
LogError("Client is trying to use a code from a different client", new { clientId = _validatedRequest.Client.ClientId, codeClient = authZcode.ClientId });
return Invalid(OidcConstants.TokenErrors.InvalidGrant);
}

/////////////////////////////////////////////
// validate code expiration
/////////////////////////////////////////////
Expand Down