Skip to content

Fix for #4791 - don't use WSTrust for ROPC except for AAD authorities #4794

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 5 commits into from
Jun 6, 2024
Merged

Fix for #4791 - don't use WSTrust for ROPC except for AAD authorities #4794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1ee8f13
Fix for #4791
bgavrilMS Jun 3, 2024
c4872b8
Fix for #4791
bgavrilMS Jun 3, 2024
e10543d
Merge branch 'bogavril/ropc' of https://github.com/AzureAD/microsoft-…
bgavrilMS Jun 4, 2024
4ed39f4
fix
bgavrilMS Jun 4, 2024
1f326ac
Merge branch 'main' into bogavril/ropc
neha-bhargava Jun 6, 2024
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
6 changes: 3 additions & 3 deletions src/client/Microsoft.Identity.Client/AppConfig/AuthorityInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ private AuthorityInfo(
/// <summary>
/// For IWA
/// </summary>
internal bool IsUserAssertionSupported =>
AuthorityType != AuthorityType.Adfs &&
AuthorityType != AuthorityType.B2C;
internal bool IsWsTrustFlowSupported =>
AuthorityType == AuthorityType.Aad ||
AuthorityType == AuthorityType.Dsts;

/// <summary>
/// Authority supports multi-tenancy. ADFS and Generic authorities are not tenanted.
Expand Down
2 changes: 1 addition & 1 deletion src/client/Microsoft.Identity.Client/Internal/Requests/IntegratedWindowsAuthRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ protected override async Task<AuthenticationResult> ExecuteAsync(CancellationTok

private async Task<UserAssertion> FetchAssertionFromWsTrustAsync()
{
if (!AuthenticationRequestParameters.AuthorityInfo.IsUserAssertionSupported)
if (!AuthenticationRequestParameters.AuthorityInfo.IsWsTrustFlowSupported)
{
//IWA is currently not supported in pure adfs environments. See https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/2771
throw new MsalClientException(
Expand Down
2 changes: 1 addition & 1 deletion src/client/Microsoft.Identity.Client/Internal/Requests/UsernamePasswordRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ private async Task<MsalTokenResponse> GetTokenResponseAsync(CancellationToken ca

private async Task<UserAssertion> FetchAssertionFromWsTrustAsync()
{
if (!AuthenticationRequestParameters.AuthorityInfo.IsUserAssertionSupported)
if (!AuthenticationRequestParameters.AuthorityInfo.IsWsTrustFlowSupported)
{
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Microsoft.Identity.Test.Unit/CoreTests/InstanceTests/DstsAuthorityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public void DstsAuthorityFlags()
Assert.IsTrue((app.AppConfig as ApplicationConfiguration).Authority.AuthorityInfo.CanBeTenanted);
Assert.IsTrue((app.AppConfig as ApplicationConfiguration).Authority.AuthorityInfo.IsClientInfoSupported);
Assert.IsFalse((app.AppConfig as ApplicationConfiguration).Authority.AuthorityInfo.IsInstanceDiscoverySupported);
Assert.IsTrue((app.AppConfig as ApplicationConfiguration).Authority.AuthorityInfo.IsUserAssertionSupported);
Assert.IsTrue((app.AppConfig as ApplicationConfiguration).Authority.AuthorityInfo.IsWsTrustFlowSupported);
}

[TestMethod]
Expand Down