mirror of
https://github.com/alexhopeoconnor/dnsmasq-webui.git
synced 2026-10-03 22:12:00 +10:00
alex
d910688742
- Options: VersionCommand, VersionTimeoutSeconds, MinimumVersion, EnforceMinimumVersion - Version probe service and parser; startup enforcement when EnforceMinimumVersion - Save flow: block save on probe failure (VersionProbeFailed) or version below minimum (UnsupportedVersion) - Status API and Dnsmasq page: show version with tooltip, link to CHANGELOG - Readiness: GET /healthz/ready (version + dnsmasq running when StatusCommand set) - MapReadyHealthCheck extension; Dockerfile HEALTHCHECK + curl; compose healthcheck and service_healthy - Docs: README and agents.md updated
64 lines
2.3 KiB
C#
64 lines
2.3 KiB
C#
using System.Net;
|
|
using Microsoft.AspNetCore.Builder;
|
|
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
|
|
using Microsoft.AspNetCore.Http;
|
|
using Microsoft.AspNetCore.HttpOverrides;
|
|
using Microsoft.Extensions.Diagnostics.HealthChecks;
|
|
|
|
namespace DnsmasqWebUI.Extensions.Hosting;
|
|
|
|
/// <summary>
|
|
/// Middleware configuration from app settings (forwarded headers, HTTPS, CORS).
|
|
/// </summary>
|
|
public static class WebApplicationExtensions
|
|
{
|
|
/// <summary>
|
|
/// Uses forwarded headers (X-Forwarded-For, X-Forwarded-Proto) when ForwardedHeaders:Enabled is true.
|
|
/// </summary>
|
|
public static IApplicationBuilder UseForwardedHeadersFromConfiguration(this IApplicationBuilder app, IConfiguration configuration)
|
|
{
|
|
if (!configuration.GetValue<bool>("ForwardedHeaders:Enabled"))
|
|
return app;
|
|
|
|
app.UseForwardedHeaders(new ForwardedHeadersOptions
|
|
{
|
|
ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto,
|
|
KnownIPNetworks = { new System.Net.IPNetwork(IPAddress.Loopback, 8) },
|
|
});
|
|
|
|
return app;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Uses HTTPS redirection and HSTS when Https:UseRedirectAndHsts is true.
|
|
/// </summary>
|
|
public static IApplicationBuilder UseHttpsFromConfiguration(this IApplicationBuilder app, IConfiguration configuration)
|
|
{
|
|
if (!configuration.GetValue<bool>("Https:UseRedirectAndHsts"))
|
|
return app;
|
|
|
|
app.UseHttpsRedirection();
|
|
app.UseHsts();
|
|
|
|
return app;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Maps the readiness health check at /healthz/ready (checks with tag "ready", returns JSON status).
|
|
/// </summary>
|
|
public static IEndpointRouteBuilder MapReadyHealthCheck(this IEndpointRouteBuilder endpoints)
|
|
{
|
|
endpoints.MapHealthChecks("/healthz/ready", new HealthCheckOptions
|
|
{
|
|
Predicate = check => check.Tags.Contains("ready"),
|
|
ResponseWriter = static async (context, report) =>
|
|
{
|
|
context.Response.ContentType = "application/json";
|
|
var status = report.Status == HealthStatus.Healthy ? "ok" : "unhealthy";
|
|
await context.Response.WriteAsync($"{{\"status\":\"{status}\"}}", context.RequestAborted);
|
|
}
|
|
});
|
|
return endpoints;
|
|
}
|
|
}
|