Skip to content

Fix MCP endpoint with redirect HTTPS #12556

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
JamesNK merged 2 commits into from
Oct 31, 2025
Merged

Fix MCP endpoint with redirect HTTPS #12556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62d173d
Fix MCP endpoint with redirect HTTPS
JamesNK Oct 31, 2025
40786ea
Clean up
JamesNK Oct 31, 2025
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
5 changes: 3 additions & 2 deletions src/Aspire.Dashboard/DashboardWebApplication.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public DashboardWebApplication(
ConfigureKestrelEndpoints(builder, dashboardOptions);

var browserHttpsPort = dashboardOptions.Frontend.GetEndpointAddresses().FirstOrDefault(IsHttpsOrNull)?.Port;
var isAllHttps = browserHttpsPort is not null && IsHttpsOrNull(dashboardOptions.Otlp.GetGrpcEndpointAddress()) && IsHttpsOrNull(dashboardOptions.Otlp.GetHttpEndpointAddress());
var isAllHttps = browserHttpsPort is not null && IsHttpsOrNull(dashboardOptions.Otlp.GetGrpcEndpointAddress()) && IsHttpsOrNull(dashboardOptions.Otlp.GetHttpEndpointAddress()) && IsHttpsOrNull(dashboardOptions.Mcp.GetEndpointAddress());
if (isAllHttps)
{
// Explicitly configure the HTTPS redirect port as we're possibly listening on multiple HTTPS addresses
Expand Down Expand Up @@ -619,8 +619,9 @@ static void AddEndpointConfiguration(Dictionary<string, string?> values, string

var kestrelSection = context.Configuration.GetSection("Kestrel");
var configurationLoader = serverOptions.Configure(kestrelSection);
var groupedEndpoints = EndpointInfo.GroupEndpointsByAddress(endpoints);

foreach (var (address, addressEndpoints) in EndpointInfo.GroupEndpointsByAddress(endpoints))
foreach (var (address, addressEndpoints) in groupedEndpoints)
{
var name = string.Join("-", addressEndpoints.Select(m => m.Name));
var connectionTypes = addressEndpoints.Select(m => m.ConnectionType).ToList();
Expand Down
34 changes: 34 additions & 0 deletions tests/Aspire.Dashboard.Tests/Integration/McpServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,40 @@ public async Task CallService_BrowserEndPoint_Failure()
Assert.False(responseMessage.IsSuccessStatusCode);
}

[Fact]
public async Task CallService_McpEndPointHttpOnly_Success()
{
// Arrange
await using var app = IntegrationTestHelpers.CreateDashboardWebApplication(_testOutputHelper,
additionalConfiguration: data =>
{
data[DashboardConfigNames.DashboardFrontendUrlName.ConfigKey] = "https://127.0.0.1:0";
data[DashboardConfigNames.DashboardOtlpGrpcUrlName.ConfigKey] = "https://127.0.0.1:0";
data[DashboardConfigNames.DashboardOtlpHttpUrlName.ConfigKey] = "https://127.0.0.1:0";

// Only HTTP endpoint
data[DashboardConfigNames.DashboardMcpUrlName.ConfigKey] = "http://127.0.0.1:0";
});

await app.StartAsync().DefaultTimeout();

using var httpClient = IntegrationTestHelpers.CreateHttpClient($"http://{app.McpEndPointAccessor().EndPoint}");

var request = CreateListToolsRequest();

// Act
var responseMessage = await httpClient.SendAsync(request).DefaultTimeout(TestConstants.LongTimeoutDuration);
responseMessage.EnsureSuccessStatusCode();

var responseData = await GetDataFromSseResponseAsync(responseMessage);

// Assert
var jsonResponse = JsonNode.Parse(responseData!)!;
var tools = jsonResponse["result"]!["tools"]!.AsArray();

Assert.NotEmpty(tools);
}

internal static HttpRequestMessage CreateListToolsRequest()
{
var json =
Expand Down
Loading