Skip to content

Handle trailing slash in /api request #5129

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
bording merged 1 commit into from
Oct 13, 2025
Merged

Handle trailing slash in /api request #5129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 10 additions & 8 deletions src/ServiceControl.Audit/Infrastructure/WebApi/RootController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,19 @@ public RootController(Settings settings)
[HttpGet]
public OkObjectResult Urls()
{
var baseUrl = Request.GetDisplayUrl() + "/";
var baseUrl = Request.GetDisplayUrl();

if (!baseUrl.EndsWith('/'))
{
baseUrl += "/";
}

var model = new RootUrls
{
KnownEndpointsUrl = "/endpoints/known", // relative URI to allow proxying
MessageSearchUrl =
baseUrl + "messages/search/{keyword}/{?page,per_page,direction,sort}",
EndpointsMessageSearchUrl =
baseUrl +
"endpoints/{name}/messages/search/{keyword}/{?page,per_page,direction,sort}",
EndpointsMessagesUrl =
baseUrl + "endpoints/{name}/messages/{?page,per_page,direction,sort}",
MessageSearchUrl = baseUrl + "messages/search/{keyword}/{?page,per_page,direction,sort}",
EndpointsMessageSearchUrl = baseUrl + "endpoints/{name}/messages/search/{keyword}/{?page,per_page,direction,sort}",
EndpointsMessagesUrl = baseUrl + "endpoints/{name}/messages/{?page,per_page,direction,sort}",
AuditCountUrl = baseUrl + "endpoints/{name}/audit-count",
Name = SettingsReader.Read(Settings.SettingsRootNamespace, "Name", "ServiceControl.Audit"),
Description = SettingsReader.Read(Settings.SettingsRootNamespace, "Description", "The audit backend for the Particular Service Platform"),
Expand Down
19 changes: 9 additions & 10 deletions src/ServiceControl/Infrastructure/Api/ConfigurationApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,25 @@
using ServiceControl.Api;
using ServiceControl.Api.Contracts;

class ConfigurationApi(ActiveLicense license,
Settings settings,
IHttpClientFactory httpClientFactory, MassTransitConnectorHeartbeatStatus connectorHeartbeatStatus) : IConfigurationApi
class ConfigurationApi(ActiveLicense license, Settings settings, IHttpClientFactory httpClientFactory, MassTransitConnectorHeartbeatStatus connectorHeartbeatStatus) : IConfigurationApi
{
public Task<RootUrls> GetUrls(string baseUrl, CancellationToken cancellationToken)
{
if (!baseUrl.EndsWith('/'))
{
baseUrl += "/";
}

var model = new RootUrls
{
EndpointsUrl = baseUrl + "endpoints",
KnownEndpointsUrl = "/endpoints/known", // relative URI to allow proxying
SagasUrl = baseUrl + "sagas",
ErrorsUrl = baseUrl + "errors/{?page,per_page,direction,sort}",
EndpointsErrorUrl = baseUrl + "endpoints/{name}/errors/{?page,per_page,direction,sort}",
MessageSearchUrl =
baseUrl + "messages/search/{keyword}/{?page,per_page,direction,sort}",
EndpointsMessageSearchUrl =
baseUrl +
"endpoints/{name}/messages/search/{keyword}/{?page,per_page,direction,sort}",
EndpointsMessagesUrl =
baseUrl + "endpoints/{name}/messages/{?page,per_page,direction,sort}",
MessageSearchUrl = baseUrl + "messages/search/{keyword}/{?page,per_page,direction,sort}",
EndpointsMessageSearchUrl = baseUrl + "endpoints/{name}/messages/search/{keyword}/{?page,per_page,direction,sort}",
EndpointsMessagesUrl = baseUrl + "endpoints/{name}/messages/{?page,per_page,direction,sort}",
AuditCountUrl = baseUrl + "endpoints/{name}/audit-count",
Name = SettingsReader.Read(Settings.SettingsRootNamespace, "Name", "ServiceControl"),
Description = SettingsReader.Read(Settings.SettingsRootNamespace, "Description", "The management backend for the Particular Service Platform"),
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceControl/Infrastructure/WebApi/RootController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class RootController(IConfigurationApi configurationApi) : ControllerBase
{
[Route("")]
[HttpGet]
public Task<RootUrls> Urls() => configurationApi.GetUrls(Request.GetDisplayUrl() + "/", default);
public Task<RootUrls> Urls() => configurationApi.GetUrls(Request.GetDisplayUrl(), default);

[Route("instance-info")]
[Route("configuration")]
Expand Down