Skip to content
Merged
Changes from all commits
Commits
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 EssentialCSharp.Web/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,17 @@ await context.HttpContext.Response.WriteAsync(
// Configure the HTTP request pipeline.
if (!app.Environment.IsDevelopment())
{
SiteSettings siteSettings = app.Services.GetRequiredService<IOptions<SiteSettings>>().Value;
if (!Uri.TryCreate(siteSettings.BaseUrl, UriKind.Absolute, out Uri? configuredBaseUri))
{
throw new InvalidOperationException($"Invalid {SiteSettings.SectionName}:{nameof(SiteSettings.BaseUrl)} value: '{siteSettings.BaseUrl}'.");
}
string apexHost = configuredBaseUri.Host.StartsWith("www.", StringComparison.OrdinalIgnoreCase)
? configuredBaseUri.Host[4..]
: configuredBaseUri.Host;
string wwwHost = $"www.{apexHost}";
string redirectAuthority = new UriBuilder(configuredBaseUri) { Host = apexHost }.Uri.GetLeftPart(UriPartial.Authority);

app.UseExceptionHandler(exceptionApp =>
{
exceptionApp.Run(async context =>
Expand Down Expand Up @@ -493,6 +504,19 @@ await McpJsonRpcResponseWriter.WriteErrorAsync(
app.UseSecurityHeadersMiddleware(new SecurityHeadersBuilder()
.AddDefaultSecurePolicy()
.AddContentSecurityPolicy(csp));

// Redirect configured www host to configured apex host (permanent 301).
// Must be after UseForwardedHeaders so the Host header reflects the real hostname.
app.Use(async (context, next) =>
{
if (string.Equals(context.Request.Host.Host, wwwHost, StringComparison.OrdinalIgnoreCase))
{
string redirectUrl = $"{redirectAuthority}{context.Request.PathBase}{context.Request.Path}{context.Request.QueryString}";
context.Response.Redirect(redirectUrl, permanent: true);
Comment thread
github-advanced-security[bot] marked this conversation as resolved.
Fixed
return;
}
await next(context);
});
}
else
{
Expand Down
Loading