CanonicalHostRedirect rename and update behavior to align with UseHttpsRedirection in case of not configured. Add logging infrastrcutre for HealthProbe

Author: eigenverft

…e/CanonicalRedirect/CanonicalRedirect.cs …calHostRedirect/CanonicalHostRedirect.cssrc/prj/Eigenverft.Routed.RequestFilters/Middleware/CanonicalRedirect/CanonicalRedirect.cs renamed to src/prj/Eigenverft.Routed.RequestFilters/Middleware/CanonicalHostRedirect/CanonicalHostRedirect.cs src/prj/Eigenverft.Routed.RequestFilters/Middleware/CanonicalRedirect/CanonicalRedirect.cs renamed to src/prj/Eigenverft.Routed.RequestFilters/Middleware/CanonicalHostRedirect/CanonicalHostRedirect.cs

@@ -7,7 +7,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace Eigenverft.Routed.RequestFilters.Middleware.CanonicalRedirect
+namespace Eigenverft.Routed.RequestFilters.Middleware.CanonicalHostRedirect
 {
     /// <summary>
     /// Middleware that permanently redirects requests to a canonical host and (optionally) enforces HTTPS.
@@ -17,28 +17,28 @@ namespace Eigenverft.Routed.RequestFilters.Middleware.CanonicalRedirect
     /// If the app is behind a reverse proxy that terminates TLS, ensure forwarded headers are applied before this middleware
     /// so <see cref="HttpRequest.IsHttps"/> reflects the external scheme.
     /// </remarks>
-    public sealed class CanonicalRedirect
+    public sealed class CanonicalHostRedirect
     {
         private readonly RequestDelegate _next;
-        private readonly IDeferredLogger<CanonicalRedirect> _logger;
-        private readonly IOptionsMonitor<CanonicalRedirectOptions> _optionsMonitor;
+        private readonly IDeferredLogger<CanonicalHostRedirect> _logger;
+        private readonly IOptionsMonitor<CanonicalHostRedirectOptions> _optionsMonitor;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="CanonicalRedirect"/> class.
+        /// Initializes a new instance of the <see cref="CanonicalHostRedirect"/> class.
         /// </summary>
         /// <param name="nextMiddleware">The next middleware in the pipeline.</param>
         /// <param name="logger">The deferred logger instance.</param>
-        /// <param name="optionsMonitor">The options monitor for <see cref="CanonicalRedirectOptions"/>.</param>
-        public CanonicalRedirect(
+        /// <param name="optionsMonitor">The options monitor for <see cref="CanonicalHostRedirectOptions"/>.</param>
+        public CanonicalHostRedirect(
             RequestDelegate nextMiddleware,
-            IDeferredLogger<CanonicalRedirect> logger,
-            IOptionsMonitor<CanonicalRedirectOptions> optionsMonitor)
+            IDeferredLogger<CanonicalHostRedirect> logger,
+            IOptionsMonitor<CanonicalHostRedirectOptions> optionsMonitor)
         {
             _next = nextMiddleware ?? throw new ArgumentNullException(nameof(nextMiddleware));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _optionsMonitor = optionsMonitor ?? throw new ArgumentNullException(nameof(optionsMonitor));
 
-            _optionsMonitor.OnChange(_ => _logger.LogDebug("Configuration for {MiddlewareName} updated.", () => nameof(CanonicalRedirect)));
+            _optionsMonitor.OnChange(_ => _logger.LogDebug("Configuration for {MiddlewareName} updated.", () => nameof(CanonicalHostRedirect)));
         }
 
         /// <summary>
@@ -50,47 +50,65 @@ public async Task InvokeAsync(HttpContext context)
         {
             if (context == null) throw new ArgumentNullException(nameof(context));
 
-            CanonicalRedirectOptions options = _optionsMonitor.CurrentValue;
+            CanonicalHostRedirectOptions options = _optionsMonitor.CurrentValue;
 
             if (!options.Enabled)
             {
                 await _next(context);
                 return;
             }
 
-            string requestHost = context.Request.Host.Host ?? string.Empty;
-            if (requestHost.Length == 0)
+            if (!context.Request.Host.HasValue)
             {
                 await _next(context);
                 return;
             }
 
-            if (!TryResolveCanonicalHost(requestHost, options, out string canonicalHost))
+            var requestHost = context.Request.Host;           // includes port when present
+            var requestHostOnly = requestHost.Host ?? string.Empty;
+
+            if (requestHostOnly.Length == 0)
             {
                 await _next(context);
                 return;
             }
 
-            bool needsHostRedirect = !string.Equals(requestHost, canonicalHost, StringComparison.OrdinalIgnoreCase);
+            // 1) HTTPS enforcement must be independent of canonical-host logic.
             bool needsHttpsRedirect = options.EnforceHttps && !context.Request.IsHttps;
 
+            // 2) Canonical host resolution is optional. If not configured / not matching, keep current host.
+            string targetHostOnly = requestHostOnly;
+            bool needsHostRedirect = false;
+
+            if (!string.IsNullOrWhiteSpace(options.PrimaryApexHost) &&
+                TryResolveCanonicalHost(requestHostOnly, options, out string canonicalHostOnly))
+            {
+                targetHostOnly = canonicalHostOnly;
+                needsHostRedirect = !string.Equals(requestHostOnly, targetHostOnly, StringComparison.OrdinalIgnoreCase);
+            }
+
             if (!needsHostRedirect && !needsHttpsRedirect)
             {
                 await _next(context);
                 return;
             }
 
-            string targetScheme = options.EnforceHttps ? "https" : (context.Request.Scheme ?? "http");
+            // Preserve port from incoming Host header (important for dev / non-443 setups).
+            HostString targetHost = requestHost.Port.HasValue
+                ? new HostString(targetHostOnly, requestHost.Port.Value)
+                : new HostString(targetHostOnly);
+
+            string targetScheme = needsHttpsRedirect ? "https" : (context.Request.Scheme ?? "http");
             string pathAndQuery = $"{context.Request.PathBase}{context.Request.Path}{context.Request.QueryString}";
-            string location = $"{targetScheme}://{canonicalHost}{pathAndQuery}";
+            string location = $"{targetScheme}://{targetHost}{pathAndQuery}";
 
             if (options.LogLevelRedirect != LogLevel.None && _logger.IsEnabled(options.LogLevelRedirect))
             {
                 _logger.Log(
                     options.LogLevelRedirect,
                     "Permanent canonical redirect. From {FromScheme}://{FromHost}{FromPath} to {ToLocation}.",
                     () => context.Request.Scheme ?? string.Empty,
-                    () => requestHost,
+                    () => requestHost.Value ?? string.Empty,
                     () => pathAndQuery,
                     () => location);
             }
@@ -99,7 +117,8 @@ public async Task InvokeAsync(HttpContext context)
             context.Response.Headers.Location = location;
         }
 
-        private static bool TryResolveCanonicalHost(string requestHost, CanonicalRedirectOptions options, out string canonicalHost)
+
+        private static bool TryResolveCanonicalHost(string requestHost, CanonicalHostRedirectOptions options, out string canonicalHost)
         {
             canonicalHost = string.Empty;
 

…icalRedirect/CanonicalRedirectOptions.cs …Redirect/CanonicalHostRedirectOptions.cssrc/prj/Eigenverft.Routed.RequestFilters/Middleware/CanonicalRedirect/CanonicalRedirectOptions.cs renamed to src/prj/Eigenverft.Routed.RequestFilters/Middleware/CanonicalHostRedirect/CanonicalHostRedirectOptions.cs src/prj/Eigenverft.Routed.RequestFilters/Middleware/CanonicalRedirect/CanonicalRedirectOptions.cs renamed to src/prj/Eigenverft.Routed.RequestFilters/Middleware/CanonicalHostRedirect/CanonicalHostRedirectOptions.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 
-namespace Eigenverft.Routed.RequestFilters.Middleware.CanonicalRedirect
+namespace Eigenverft.Routed.RequestFilters.Middleware.CanonicalHostRedirect
 {
     /// <summary>
     /// Determines how host canonicalization is applied.
@@ -25,13 +25,13 @@ public enum CanonicalHostMode
     }
 
     /// <summary>
-    /// Provides configuration options for <see cref="CanonicalRedirect"/>.
+    /// Provides configuration options for <see cref="CanonicalHostRedirect"/>.
     /// </summary>
     /// <remarks>
     /// This options type is designed to be bound from configuration, for example from a section named
-    /// <c>CanonicalRedirectOptions</c>. If the section is missing, property initializers act as defaults.
+    /// <c>CanonicalHostRedirectOptions</c>. If the section is missing, property initializers act as defaults.
     /// </remarks>
-    public sealed class CanonicalRedirectOptions
+    public sealed class CanonicalHostRedirectOptions
     {
         /// <summary>
         /// Gets or sets a value indicating whether the middleware is active.

…edirect/IApplicationBuilderExtensions.cs …edirect/IApplicationBuilderExtensions.cssrc/prj/Eigenverft.Routed.RequestFilters/Middleware/CanonicalRedirect/IApplicationBuilderExtensions.cs renamed to src/prj/Eigenverft.Routed.RequestFilters/Middleware/CanonicalHostRedirect/IApplicationBuilderExtensions.cs src/prj/Eigenverft.Routed.RequestFilters/Middleware/CanonicalRedirect/IApplicationBuilderExtensions.cs renamed to src/prj/Eigenverft.Routed.RequestFilters/Middleware/CanonicalHostRedirect/IApplicationBuilderExtensions.cs

@@ -8,51 +8,51 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
-namespace Eigenverft.Routed.RequestFilters.Middleware.CanonicalRedirect
+namespace Eigenverft.Routed.RequestFilters.Middleware.CanonicalHostRedirect
 {
     /// <summary>
-    /// Provides extension methods for registering <see cref="CanonicalRedirect"/> in the application's request pipeline.
+    /// Provides extension methods for registering <see cref="CanonicalHostRedirect"/> in the application's request pipeline.
     /// </summary>
     public static partial class IApplicationBuilderExtensions
     {
         /// <summary>
-        /// Adds <see cref="CanonicalRedirect"/> to the application's request pipeline.
+        /// Adds <see cref="CanonicalHostRedirect"/> to the application's request pipeline.
         /// </summary>
         /// <param name="app">The application builder.</param>
         /// <returns>The updated application builder.</returns>
         /// <exception cref="ArgumentNullException">Thrown if <paramref name="app"/> is null.</exception>
-        public static IApplicationBuilder UseCanonicalRedirect(this IApplicationBuilder app)
+        public static IApplicationBuilder UseCanonicalHostRedirect(this IApplicationBuilder app)
         {
             ArgumentNullException.ThrowIfNull(app);
 
             app.ApplicationServices.EnsureServicesRegistered(
-                $"Make sure to register deferred logging via services.{nameof(IServiceCollectionExtensions.AddCanonicalRedirect)}().",
+                $"Make sure to register deferred logging via services.{nameof(IServiceCollectionExtensions.AddCanonicalHostRedirect)}().",
                 typeof(IDeferredLogger<>));
 
-            return app.UseMiddleware<CanonicalRedirect>();
+            return app.UseMiddleware<CanonicalHostRedirect>();
         }
 
         /// <summary>
-        /// Adds <see cref="CanonicalRedirect"/> to the request pipeline while applying an additional configuration.
+        /// Adds <see cref="CanonicalHostRedirect"/> to the request pipeline while applying an additional configuration.
         /// The extra configuration is applied on top of the DI-registered options (which are auto-refreshed if appsettings change).
         /// </summary>
         /// <param name="app">The application builder.</param>
-        /// <param name="additionalConfigure">Delegate to apply extra configuration to <see cref="CanonicalRedirectOptions"/>.</param>
+        /// <param name="additionalConfigure">Delegate to apply extra configuration to <see cref="CanonicalHostRedirectOptions"/>.</param>
         /// <returns>The updated application builder.</returns>
         /// <exception cref="ArgumentNullException">Thrown if <paramref name="app"/> or <paramref name="additionalConfigure"/> is null.</exception>
-        public static IApplicationBuilder UseCanonicalRedirect(this IApplicationBuilder app, Action<CanonicalRedirectOptions> additionalConfigure)
+        public static IApplicationBuilder UseCanonicalHostRedirect(this IApplicationBuilder app, Action<CanonicalHostRedirectOptions> additionalConfigure)
         {
             ArgumentNullException.ThrowIfNull(app);
             ArgumentNullException.ThrowIfNull(additionalConfigure);
 
             app.ApplicationServices.EnsureServicesRegistered(
-                $"Make sure to register deferred logging via services.{nameof(IServiceCollectionExtensions.AddCanonicalRedirect)}().",
+                $"Make sure to register deferred logging via services.{nameof(IServiceCollectionExtensions.AddCanonicalHostRedirect)}().",
                 typeof(IDeferredLogger<>));
 
-            IOptionsMonitor<CanonicalRedirectOptions> innerOptionsMonitor = app.ApplicationServices.GetRequiredService<IOptionsMonitor<CanonicalRedirectOptions>>();
-            var decoratedOptionsMonitor = new ConfiguredOptionsMonitor<CanonicalRedirectOptions>(innerOptionsMonitor, additionalConfigure);
+            IOptionsMonitor<CanonicalHostRedirectOptions> innerOptionsMonitor = app.ApplicationServices.GetRequiredService<IOptionsMonitor<CanonicalHostRedirectOptions>>();
+            var decoratedOptionsMonitor = new ConfiguredOptionsMonitor<CanonicalHostRedirectOptions>(innerOptionsMonitor, additionalConfigure);
 
-            return app.UseMiddleware<CanonicalRedirect>(decoratedOptionsMonitor);
+            return app.UseMiddleware<CanonicalHostRedirect>(decoratedOptionsMonitor);
         }
     }
 }

…Redirect/IServiceCollectionExtensions.cs …Redirect/IServiceCollectionExtensions.cssrc/prj/Eigenverft.Routed.RequestFilters/Middleware/CanonicalRedirect/IServiceCollectionExtensions.cs renamed to src/prj/Eigenverft.Routed.RequestFilters/Middleware/CanonicalHostRedirect/IServiceCollectionExtensions.cs src/prj/Eigenverft.Routed.RequestFilters/Middleware/CanonicalRedirect/IServiceCollectionExtensions.cs renamed to src/prj/Eigenverft.Routed.RequestFilters/Middleware/CanonicalHostRedirect/IServiceCollectionExtensions.cs

@@ -6,7 +6,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace Eigenverft.Routed.RequestFilters.Middleware.CanonicalRedirect
+namespace Eigenverft.Routed.RequestFilters.Middleware.CanonicalHostRedirect
 {
     /// <summary>
     /// Provides extension methods for configuring canonical host redirects.
@@ -15,23 +15,23 @@ public static partial class IServiceCollectionExtensions
     {
         /// <summary>
         /// Registers canonical redirect with the standard behavior:
-        /// binds from configuration section <c>CanonicalRedirectOptions</c> if present,
-        /// otherwise uses defaults defined on <see cref="CanonicalRedirectOptions"/>.
+        /// binds from configuration section <c>CanonicalHostRedirectOptions</c> if present,
+        /// otherwise uses defaults defined on <see cref="CanonicalHostRedirectOptions"/>.
         /// </summary>
         /// <param name="services">The service collection.</param>
         /// <returns>The updated service collection.</returns>
         /// <example>
         /// <code>
-        /// builder.Services.AddCanonicalRedirect();
+        /// builder.Services.AddCanonicalHostRedirect();
         /// </code>
         /// </example>
-        public static IServiceCollection AddCanonicalRedirect(this IServiceCollection services)
+        public static IServiceCollection AddCanonicalHostRedirect(this IServiceCollection services)
         {
             ArgumentNullException.ThrowIfNull(services);
 
             AddInfrastructure(services);
 
-            services.AddOptions<CanonicalRedirectOptions>().BindConfiguration(nameof(CanonicalRedirectOptions));
+            services.AddOptions<CanonicalHostRedirectOptions>().BindConfiguration(nameof(CanonicalHostRedirectOptions));
 
             return services;
         }
@@ -43,12 +43,12 @@ public static IServiceCollection AddCanonicalRedirect(this IServiceCollection se
         /// <param name="manualConfigure">Delegate to modify or augment the bound configuration.</param>
         /// <returns>The updated service collection.</returns>
         /// <exception cref="ArgumentNullException">Thrown if <paramref name="services"/> or <paramref name="manualConfigure"/> is null.</exception>
-        public static IServiceCollection AddCanonicalRedirect(this IServiceCollection services, Action<CanonicalRedirectOptions> manualConfigure)
+        public static IServiceCollection AddCanonicalHostRedirect(this IServiceCollection services, Action<CanonicalHostRedirectOptions> manualConfigure)
         {
             ArgumentNullException.ThrowIfNull(services);
             ArgumentNullException.ThrowIfNull(manualConfigure);
 
-            services.AddCanonicalRedirect();
+            services.AddCanonicalHostRedirect();
             services.Configure(manualConfigure);
 
             return services;
@@ -58,18 +58,18 @@ public static IServiceCollection AddCanonicalRedirect(this IServiceCollection se
         /// Registers canonical redirect options explicitly from a provided configuration and optionally applies extra code-based configuration.
         /// </summary>
         /// <param name="services">The service collection.</param>
-        /// <param name="configuration">Configuration root that contains a section named <c>CanonicalRedirectOptions</c>.</param>
+        /// <param name="configuration">Configuration root that contains a section named <c>CanonicalHostRedirectOptions</c>.</param>
         /// <param name="manualConfigure">Optional delegate to modify or augment the bound configuration.</param>
         /// <returns>The updated service collection.</returns>
         /// <exception cref="ArgumentNullException">Thrown if <paramref name="services"/> or <paramref name="configuration"/> is null.</exception>
-        public static IServiceCollection AddCanonicalRedirect(this IServiceCollection services, IConfiguration configuration, Action<CanonicalRedirectOptions>? manualConfigure = null)
+        public static IServiceCollection AddCanonicalHostRedirect(this IServiceCollection services, IConfiguration configuration, Action<CanonicalHostRedirectOptions>? manualConfigure = null)
         {
             ArgumentNullException.ThrowIfNull(services);
             ArgumentNullException.ThrowIfNull(configuration);
 
             AddInfrastructure(services);
 
-            services.AddOptions<CanonicalRedirectOptions>().Bind(configuration.GetSection(nameof(CanonicalRedirectOptions)));
+            services.AddOptions<CanonicalHostRedirectOptions>().Bind(configuration.GetSection(nameof(CanonicalHostRedirectOptions)));
 
             if (manualConfigure != null)
             {

src/prj/Eigenverft.Routed.RequestFilters/Middleware/HealthProbeFaviconAware/IServiceCollection.cs

@@ -1,7 +1,10 @@
 using System;
 
+using Eigenverft.Routed.RequestFilters.Services.DeferredLogger;
+
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Eigenverft.Routed.RequestFilters.Middleware.HealthProbeFaviconAware
 {
@@ -26,6 +29,8 @@ public static IServiceCollection AddHealthProbeFaviconAware(this IServiceCollect
         {
             ArgumentNullException.ThrowIfNull(services);
 
+            AddInfrastructure(services);
+
             services.AddOptions<HealthProbeFaviconAwareOptions>().BindConfiguration(nameof(HealthProbeFaviconAwareOptions));
 
             return services;
@@ -63,10 +68,22 @@ public static IServiceCollection AddHealthProbeFaviconAware(this IServiceCollect
             ArgumentNullException.ThrowIfNull(services);
             ArgumentNullException.ThrowIfNull(configuration);
 
+            AddInfrastructure(services);
+
             services.AddOptions<HealthProbeFaviconAwareOptions>().Bind(configuration.GetSection(nameof(HealthProbeFaviconAwareOptions)));
             if (manualConfigure != null) services.Configure(manualConfigure);
 
             return services;
         }
+
+        /// <summary>
+        /// Adds shared registrations required by canonical redirect.
+        /// </summary>
+        /// <param name="services">The service collection.</param>
+        private static void AddInfrastructure(IServiceCollection services)
+        {
+            services.TryAddSingleton(typeof(IDeferredLogger<>), typeof(DeferredLogger<>));
+            services.AddOptions();
+        }
     }
 }