Skip to content

Fix KnownInstanceMetadataIsUpToDateAsync: guard HTTP status codes on discovery endpoints #6048

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
gladjohn merged 2 commits into from
Jun 2, 2026
+24 −0
Merged

Fix KnownInstanceMetadataIsUpToDateAsync: guard HTTP status codes on discovery endpoints #6048

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0aab525
Initial plan
Copilot Jun 2, 2026
982adc0
Fix KnownInstanceMetadataIsUpToDateAsync: add HTTP status-code guards…
Copilot Jun 2, 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
24 changes: 24 additions & 0 deletions ...soft.Identity.Test.Integration.netcore/HeadlessTests/InstanceDiscoveryIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,26 @@ public async Task KnownInstanceMetadataIsUpToDateAsync()
HttpMethod.Get,
validDiscoveryUri)).ConfigureAwait(false);
string discoveryJson = await discoveryResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
if (!discoveryResponse.IsSuccessStatusCode)
{
Assert.Fail(
$"Public discovery endpoint returned {(int)discoveryResponse.StatusCode} " +
$"{discoveryResponse.ReasonPhrase}. Body: {Truncate(discoveryJson)}");
}

HttpResponseMessage ppeDiscoveryResponse = await httpClient.SendAsync(
new HttpRequestMessage(
HttpMethod.Get,
validPpeDiscoveryUri)).ConfigureAwait(false);
string ppeDiscoveryJson = await ppeDiscoveryResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
if (!ppeDiscoveryResponse.IsSuccessStatusCode)
{
Assert.Inconclusive(
$"PPE discovery endpoint {validPpeDiscoveryUri} returned " +
$"{(int)ppeDiscoveryResponse.StatusCode} {ppeDiscoveryResponse.ReasonPhrase}. " +
$"This is typically an environmental issue (login.windows-ppe.net is restricted). " +
$"Body: {Truncate(ppeDiscoveryJson)}");
}

InstanceDiscoveryMetadataEntry[] actualMetadata = JsonHelper.DeserializeFromJson<InstanceDiscoveryResponse>(discoveryJson).Metadata;
InstanceDiscoveryMetadataEntry[] actualPpeMetadata = JsonHelper.DeserializeFromJson<InstanceDiscoveryResponse>(ppeDiscoveryJson).Metadata;
Expand Down Expand Up @@ -177,6 +191,16 @@ public async Task KnownInstanceMetadataIsUpToDateAsync()
new InstanceDiscoveryMetadataEntryComparer());
}

private static string Truncate(string s, int maxLength = 500)
{
if (string.IsNullOrEmpty(s))
{
return string.Empty;
}

return s.Length <= maxLength ? s : s.Substring(0, maxLength);
}

private class InstanceDiscoveryMetadataEntryComparer : IEqualityComparer<InstanceDiscoveryMetadataEntry>
{
public bool Equals(InstanceDiscoveryMetadataEntry x, InstanceDiscoveryMetadataEntry y)
Expand Down
Loading