Skip to content

Do not carry authority port to global instance discovery #6155

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
Bogdan Gavril (bgavrilMS) merged 3 commits into from
Sep 17, 2026
Merged

Do not carry authority port to global instance discovery #6155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6831f1
Do not carry authority port to global discovery
bgavrilMS Jul 31, 2026
26275b2
Test custom port preservation for same-host instance discovery
bgavrilMS Sep 15, 2026
d1c776c
Test global discovery port when endpoint is not configured
bgavrilMS Sep 15, 2026
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
10 changes: 7 additions & 3 deletions src/client/Microsoft.Identity.Client/Instance/Discovery/NetworkMetadataProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,13 @@ private Uri ComputeHttpEndpoint(Uri authority, RequestContext requestContext)
authority.Host :
AadAuthority.DefaultTrustedHost;

string instanceDiscoveryEndpoint = UriBuilderExtensions.GetHttpsUriWithOptionalPort(
$"https://{discoveryHost}/common/discovery/instance",
authority.Port);
string instanceDiscoveryEndpoint = $"https://{discoveryHost}/common/discovery/instance";
if (string.Equals(discoveryHost, authority.Host, StringComparison.OrdinalIgnoreCase))
{
instanceDiscoveryEndpoint = UriBuilderExtensions.GetHttpsUriWithOptionalPort(
instanceDiscoveryEndpoint,
authority.Port);
}

requestContext.Logger.InfoPii(
() => $"Fetching instance discovery from the network from host {discoveryHost}. Endpoint {instanceDiscoveryEndpoint}. ",
Expand Down
6 changes: 5 additions & 1 deletion src/client/Microsoft.Identity.Lab.Api/Http/MockHttpManagerExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ public static MockHttpMessageHandler AddInstanceDiscoveryMockHandler(
? authorityURI.Host
: AadAuthority.DefaultTrustedHost;

discoveryEndpoint = UriBuilderExtensions.GetHttpsUriWithOptionalPort($"https://{discoveryHost}/common/discovery/instance", authorityURI.Port);
discoveryEndpoint = $"https://{discoveryHost}/common/discovery/instance";
if (string.Equals(discoveryHost, authorityURI.Host, StringComparison.OrdinalIgnoreCase))
{
discoveryEndpoint = UriBuilderExtensions.GetHttpsUriWithOptionalPort(discoveryEndpoint, authorityURI.Port);
}
}
else
{
Expand Down
6 changes: 4 additions & 2 deletions tests/Microsoft.Identity.Test.Unit/CoreTests/InstanceTests/AadAuthorityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,12 +297,14 @@ public void TenantlessAuthorityChanges()

[TestMethod]
//Test for bug #1292 (https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/1292)
public void AuthorityCustomPortTest()
public void AuthorityCustomPortIsPreservedAndNotUsedForGlobalInstanceDiscoveryTest()
Comment thread
bgavrilMS marked this conversation as resolved.
Resolved
{
const string customPortAuthority = "https://localhost:5215/common/";

using var harness = CreateTestHarness();
harness.HttpManager.AddInstanceDiscoveryMockHandler(customPortAuthority);
harness.HttpManager.AddInstanceDiscoveryMockHandler(
customPortAuthority,
new Uri("https://login.microsoftonline.com/common/discovery/instance"));

PublicClientApplication app = PublicClientApplicationBuilder.Create(TestConstants.ClientId)
.WithAuthority(new Uri(customPortAuthority), false)
Expand Down
45 changes: 45 additions & 0 deletions tests/Microsoft.Identity.Test.Unit/CoreTests/InstanceTests/InstanceDiscoveryManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,51 @@ await ValidateSelfEntryAsync(new Uri(TestConstants.ADFSAuthority))
.ConfigureAwait(false);
}

[TestMethod]
public async Task NetworkMetadataProvider_PreservesCustomPort_WhenDiscoveryHostMatchesAuthority_Async()
{
// Arrange
const string authority = "https://login.microsoftonline.com:5215/common/";
const string expectedDiscoveryEndpoint = "https://login.microsoftonline.com:5215/common/discovery/instance";
var networkMetadataProvider = new NetworkMetadataProvider(
_harness.HttpManager,
_networkCacheMetadataProvider);
var handler = _harness.HttpManager.AddInstanceDiscoveryMockHandler(
authority,
new Uri(expectedDiscoveryEndpoint));

// Act
await networkMetadataProvider.GetMetadataAsync(new Uri(authority), _testRequestContext)
.ConfigureAwait(false);

// Assert
Assert.IsNotNull(handler.ActualRequestMessage);
Assert.AreEqual(5215, handler.ActualRequestMessage.RequestUri.Port);
Assert.AreEqual(expectedDiscoveryEndpoint, handler.ActualRequestMessage.RequestUri.GetLeftPart(UriPartial.Path));
}

[TestMethod]
public async Task NetworkMetadataProvider_DropsCustomPort_WhenDiscoveryEndpointIsNotSetAndAuthorityIsUnknown_Async()
{
// Arrange
const string authority = "https://localhost:5215/common/";
const string expectedDiscoveryEndpoint = "https://login.microsoftonline.com/common/discovery/instance";
var networkMetadataProvider = new NetworkMetadataProvider(
_harness.HttpManager,
_networkCacheMetadataProvider);
var handler = _harness.HttpManager.AddInstanceDiscoveryMockHandler(authority);

// Act
await networkMetadataProvider.GetMetadataAsync(new Uri(authority), _testRequestContext)
.ConfigureAwait(false);

// Assert
Assert.IsNotNull(handler.ActualRequestMessage);
Assert.AreEqual("login.microsoftonline.com", handler.ActualRequestMessage.RequestUri.Host);
Assert.AreEqual(443, handler.ActualRequestMessage.RequestUri.Port);
Assert.AreEqual(expectedDiscoveryEndpoint, handler.ActualRequestMessage.RequestUri.GetLeftPart(UriPartial.Path));
}

[TestMethod]
public async Task NetworkCacheProvider_IsUsedFirst_Async()
{
Expand Down
Loading