Skip to content
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

Update Microsoft.Identity.Model to 7.0.0-preview3 #50218

Merged
merged 7 commits into from
Aug 25, 2023
Merged

Update Microsoft.Identity.Model to 7.0.0-preview3 #50218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2773c88
Update Microsoft.Identity.Model to 7.0.0-preview3
jennyf19 Aug 21, 2023
55b5027
fixing null refs in WsFed
jennyf19 Aug 21, 2023
7eb7de9
Add link to tracking issue.
eerhardt Aug 21, 2023
0da1932
Add link to tracking issue.
eerhardt Aug 21, 2023
fda561a
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Aug 24, 2023
004cd16
Merge branch 'release/8.0' into jennyf/M.IM.Preview3
eerhardt Aug 25, 2023
d843773
Workaround https://github.com/AzureAD/azure-activedirectory-identitym…
eerhardt Aug 25, 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
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>90b92bb265a412592c4c152983d7b30c92236dbe</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23421.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23424.1">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>1bc73adce07951fc0931ebd2b93492db78c538df</Sha>
<Sha>e3cc6c792114ebdfe6627742d2820dbe1ae5bc47</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.0.0-beta-23228-03">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<AspNetCorePatchVersion>0</AspNetCorePatchVersion>
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
<ValidateBaseline>true</ValidateBaseline>
<IdentityModelVersion>7.0.0-preview</IdentityModelVersion>
<IdentityModelVersion>7.0.0-preview3</IdentityModelVersion>
<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-->
Expand Down Expand Up @@ -162,7 +162,7 @@
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23419.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23419.1</MicrosoftDotNetRemoteExecutorVersion>
<!-- Packages from dotnet/source-build-externals -->
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23421.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23424.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
<!-- Packages from dotnet/source-build-reference-packages -->
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.23421.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
<!-- Packages from dotnet/symreader -->
Expand Down
6 changes: 3 additions & 3 deletions src/Security/Authentication/WsFederation/src/WsFederationHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ protected override async Task HandleChallengeAsync(AuthenticationProperties prop
var wsFederationMessage = new WsFederationMessage()
{
IssuerAddress = _configuration.TokenEndpoint ?? string.Empty,
Wtrealm = Options.Wtrealm,
Wtrealm = Options.Wtrealm!, // TODO: https://github.com/dotnet/aspnetcore/issues/50242
Wa = WsFederationConstants.WsFederationActions.SignIn,
};

Expand Down Expand Up @@ -195,7 +195,7 @@ protected override async Task<HandleRequestResult> HandleRemoteAuthenticateAsync
{
// Extract the user state from properties and reset.
properties.Items.TryGetValue(WsFederationDefaults.UserstatePropertiesKey, out var userState);
wsFederationMessage.Wctx = userState;
wsFederationMessage.Wctx = userState!; // TODO: '!' can be removed with https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/issues/2240
}

var messageReceivedContext = new MessageReceivedContext(Context, Scheme, Options, properties)
Expand Down Expand Up @@ -425,7 +425,7 @@ public virtual async Task SignOutAsync(AuthenticationProperties? properties)
var wsFederationMessage = new WsFederationMessage()
{
IssuerAddress = _configuration.TokenEndpoint ?? string.Empty,
Wtrealm = Options.Wtrealm,
Wtrealm = Options.Wtrealm!, // TODO: https://github.com/dotnet/aspnetcore/issues/50242
Wa = WsFederationConstants.WsFederationActions.SignOut,
};

Expand Down
32 changes: 17 additions & 15 deletions src/Security/Authentication/test/JwtBearerTests_Handler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,21 +914,23 @@ public async Task ExpirationAndIssuedSetOnAuthenticateResult()
public async Task ExpirationAndIssuedWhenMinOrMaxValue()
{
var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(new string('a', 128)));
var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);

var claims = new[]
{
new Claim(ClaimTypes.NameIdentifier, "Bob")
};

var token = new JwtSecurityToken(
issuer: "issuer.contoso.com",
audience: "audience.contoso.com",
claims: claims,
expires: DateTime.MaxValue,
signingCredentials: creds);

var tokenText = new JwtSecurityTokenHandler().WriteToken(token);
//var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);

//var claims = new[]
//{
// new Claim(ClaimTypes.NameIdentifier, "Bob")
//};

//var token = new JwtSecurityToken(
// issuer: "issuer.contoso.com",
// audience: "audience.contoso.com",
// claims: claims,
// expires: DateTime.MaxValue,
// signingCredentials: creds);

//var tokenText = new JwtSecurityTokenHandler().WriteToken(token);
// TODO: when https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/issues/2261 is fixed, uncomment the above code and remove this hard-coded string
var tokenText = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1laWRlbnRpZmllciI6IkJvYiIsImV4cCI6MjUzNDAyMzAwODAwLCJpc3MiOiJpc3N1ZXIuY29udG9zby5jb20iLCJhdWQiOiJhdWRpZW5jZS5jb250b3NvLmNvbSJ9.0zvasyAh-GmjR_o46QSRCoQ9VaSXJjW5_YMcR6qy-jw";

using var host = await CreateHost(o =>
{
Expand Down