Skip to content

Update JwtBearer, WsFed, and OIDC handlers to use identity model 7 #49542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Jul 21, 2023
Merged

Update JwtBearer, WsFed, and OIDC handlers to use identity model 7 #49542

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2260e57
Option to use JsonWebTokenHandler in OpenIdConnectHandler
Jun 23, 2023
61323b8
fix sample
Jun 29, 2023
7f45829
split event tests
Jun 29, 2023
507d241
update IdentityModel to 6.31.0
Jun 14, 2023
47ffe32
Added JsonWebTokenHandler and TokenHandlers (#48857)
brentschmaltz Jun 16, 2023
4153b06
adjust for claims mapping
Jun 22, 2023
7fa2f96
moved api's to unshipped
Jun 22, 2023
aca45dd
Addressed PR comments
Jul 8, 2023
0402406
Removed setter.
Jul 8, 2023
b208837
Use 7.0.0-preview for identity model libraries
Jul 11, 2023
df64e72
fix bild break, useTokenHanlders default false.
Jul 11, 2023
9a4cc56
use var for identitymodel versions
Jul 11, 2023
a4c116c
Move new apis to unshipped
Jul 11, 2023
e63b5ce
Increase key size to 256 bits or HMAC will fail.
Jul 12, 2023
4501b82
update version of identity model libraries (#49349)
keegan-caruso Jul 17, 2023
583728e
Update Wilson7 branch (#49491)
captainsafia Jul 18, 2023
65595cb
Merge branch 'main' into Wilson7
captainsafia Jul 18, 2023
f22eba9
Update Wilson7 branch (#49524)
keegan-caruso Jul 20, 2023
b7c4701
Changes from API review
Jul 20, 2023
ce34b0f
Merge branch 'keegan-caruso/json-web-handler-oidc' into keegan-caruso…
Jul 20, 2023
7d0bc0b
Comments from review
Jul 20, 2023
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
Prev Previous commit
Next Next commit
Use 7.0.0-preview for identity model libraries
  • Loading branch information
Keegan Caruso committed Jul 11, 2023
commit b208837500902d310b151f5439dff947be35653d
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,15 +248,15 @@
<MicrosoftCodeAnalysisCSharpAnalyzerTestingXUnitVersion>1.1.2-beta1.22531.1</MicrosoftCodeAnalysisCSharpAnalyzerTestingXUnitVersion>
<MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>1.1.2-beta1.22531.1</MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>
<MicrosoftCssParserVersion>1.0.0-20230414.1</MicrosoftCssParserVersion>
<MicrosoftIdentityModelLoggingVersion>6.31.0</MicrosoftIdentityModelLoggingVersion>
<MicrosoftIdentityModelProtocolsOpenIdConnectVersion>6.31.0</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
<MicrosoftIdentityModelProtocolsWsFederationVersion>6.31.0</MicrosoftIdentityModelProtocolsWsFederationVersion>
<MicrosoftIdentityModelLoggingVersion>7.0.0-preview</MicrosoftIdentityModelLoggingVersion>
<MicrosoftIdentityModelProtocolsOpenIdConnectVersion>7.0.0-preview</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
<MicrosoftIdentityModelProtocolsWsFederationVersion>7.0.0-preview</MicrosoftIdentityModelProtocolsWsFederationVersion>
<MicrosoftInternalAspNetCoreH2SpecAllVersion>2.2.1</MicrosoftInternalAspNetCoreH2SpecAllVersion>
<MicrosoftNETCoreWindowsApiSetsVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsVersion>
<MicrosoftOwinSecurityCookiesVersion>3.0.1</MicrosoftOwinSecurityCookiesVersion>
<MicrosoftOwinTestingVersion>3.0.1</MicrosoftOwinTestingVersion>
<MicrosoftWebAdministrationVersion>11.1.0</MicrosoftWebAdministrationVersion>
<SystemIdentityModelTokensJwtVersion>6.31.0</SystemIdentityModelTokensJwtVersion>
<SystemIdentityModelTokensJwtVersion>7.0.0-preview</SystemIdentityModelTokensJwtVersion>
<SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>
<SystemNetExperimentalMsQuicVersion>5.0.0-alpha.20560.6</SystemNetExperimentalMsQuicVersion>
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
Expand Down
12 changes: 7 additions & 5 deletions src/Security/Authentication/OpenIdConnect/src/OpenIdConnectHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,8 +656,7 @@ protected override async Task<HandleRequestResult> HandleRemoteAuthenticateAsync
{
var tokenValidationResult = await ValidateTokenUsingHandlerAsync(authorizationResponse.IdToken, properties, validationParameters);
user = new ClaimsPrincipal(tokenValidationResult.ClaimsIdentity);
// todo: need to use converter in 7x branch here
jwt = new JwtSecurityToken();
jwt = JwtSecurityTokenConverter.Convert(tokenValidationResult.SecurityToken as JsonWebToken);
}
else
{
Expand Down Expand Up @@ -737,8 +736,7 @@ protected override async Task<HandleRequestResult> HandleRemoteAuthenticateAsync
{
var tokenValidationResult = await ValidateTokenUsingHandlerAsync(tokenEndpointResponse.IdToken, properties, validationParameters);
tokenEndpointUser = new ClaimsPrincipal(tokenValidationResult.ClaimsIdentity);
// TODO: need to use converter to create jwt
tokenEndpointJwt = new JwtSecurityToken();
tokenEndpointJwt = JwtSecurityTokenConverter.Convert(tokenValidationResult.SecurityToken as JsonWebToken);
}
else
{
Expand Down Expand Up @@ -1323,7 +1321,11 @@ private ClaimsPrincipal ValidateToken(string idToken, AuthenticationProperties p
// Note this modifies properties if Options.UseTokenLifetime
private async Task<TokenValidationResult> ValidateTokenUsingHandlerAsync(string idToken, AuthenticationProperties properties, TokenValidationParameters validationParameters)
{
if (_configuration != null)
if (Options.ConfigurationManager is BaseConfigurationManager baseConfigurationManager)
{
validationParameters.ConfigurationManager = baseConfigurationManager;
}
else if (_configuration != null)
{
var issuer = new[] { _configuration.Issuer };
validationParameters.ValidIssuers = validationParameters.ValidIssuers?.Concat(issuer) ?? issuer;
Expand Down