Make HttpsRedirectionMiddleware throw if there are multiple ports #27951 (#29166)

Author: Tratcher

src/Middleware/HttpsPolicy/src/HttpsLoggingExtensions.cs

@@ -11,7 +11,6 @@ internal static class HttpsLoggingExtensions
         private static readonly Action<ILogger, string, Exception?> _redirectingToHttps;
         private static readonly Action<ILogger, int, Exception?> _portLoadedFromConfig;
         private static readonly Action<ILogger, Exception?> _failedToDeterminePort;
-        private static readonly Action<ILogger, Exception?> _failedMultiplePorts;
         private static readonly Action<ILogger, int, Exception?> _portFromServer;
 
         static HttpsLoggingExtensions()
@@ -31,12 +30,6 @@ static HttpsLoggingExtensions()
                 new EventId(3, "FailedToDeterminePort"),
                 "Failed to determine the https port for redirect.");
 
-            _failedMultiplePorts = LoggerMessage.Define(
-                LogLevel.Warning,
-                new EventId(4, "FailedMultiplePorts"),
-                "Cannot determine the https port from IServerAddressesFeature, multiple values were found. " +
-                "Please set the desired port explicitly on HttpsRedirectionOptions.HttpsPort.");
-
             _portFromServer = LoggerMessage.Define<int>(
                 LogLevel.Debug,
                 new EventId(5, "PortFromServer"),
@@ -58,11 +51,6 @@ public static void FailedToDeterminePort(this ILogger logger)
             _failedToDeterminePort(logger, null);
         }
 
-        public static void FailedMultiplePorts(this ILogger logger)
-        {
-            _failedMultiplePorts(logger, null);
-        }
-
         public static void PortFromServer(this ILogger logger, int port)
         {
             _portFromServer(logger, port, null);

src/Middleware/HttpsPolicy/src/HttpsRedirectionMiddleware.cs

@@ -48,7 +48,7 @@ public HttpsRedirectionMiddleware(RequestDelegate next, IOptions<HttpsRedirectio
             var httpsRedirectionOptions = options.Value;
             if (httpsRedirectionOptions.HttpsPort.HasValue)
             {
-                _httpsPort = new Lazy<int>(() => httpsRedirectionOptions.HttpsPort.Value);
+                _httpsPort = new Lazy<int>(httpsRedirectionOptions.HttpsPort.Value);
             }
             else
             {
@@ -149,8 +149,9 @@ private int TryGetHttpsPort()
                     // If we find multiple different https ports specified, throw
                     if (nullablePort.HasValue && nullablePort != bindingAddress.Port)
                     {
-                        _logger.FailedMultiplePorts();
-                        return PortNotFound;
+                        throw new InvalidOperationException(
+                            "Cannot determine the https port from IServerAddressesFeature, multiple values were found. " +
+                            "Set the desired port explicitly on HttpsRedirectionOptions.HttpsPort.");
                     }
                     else
                     {

src/Middleware/HttpsPolicy/test/HttpsRedirectionMiddlewareTests.cs

@@ -286,21 +286,13 @@ public async Task SetServerAddressesFeature_SingleHttpsAddress_Success()
         }
 
         [Fact]
-        public async Task SetServerAddressesFeature_MultipleHttpsAddresses_LogsAndFailsToRedirect()
+        public async Task SetServerAddressesFeature_MultipleHttpsAddresses_Throws()
         {
-            var sink = new TestSink(
-                TestSink.EnableWithTypeName<HttpsRedirectionMiddleware>,
-                TestSink.EnableWithTypeName<HttpsRedirectionMiddleware>);
-            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
             using var host = new HostBuilder()
                 .ConfigureWebHost(webHostBuilder =>
                 {
                     webHostBuilder
                     .UseTestServer()
-                    .ConfigureServices(services =>
-                    {
-                        services.AddSingleton<ILoggerFactory>(loggerFactory);
-                    })
                    .Configure(app =>
                    {
                        app.UseHttpsRedirection();
@@ -323,16 +315,9 @@ public async Task SetServerAddressesFeature_MultipleHttpsAddresses_LogsAndFailsT
 
             var request = new HttpRequestMessage(HttpMethod.Get, "");
 
-            var response = await client.SendAsync(request);
-            Assert.Equal(200, (int)response.StatusCode);
-
-            var logMessages = sink.Writes.ToList();
-
-            Assert.Single(logMessages);
-            var message = logMessages.First();
-            Assert.Equal(LogLevel.Warning, message.LogLevel);
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => client.SendAsync(request));
             Assert.Equal("Cannot determine the https port from IServerAddressesFeature, multiple values were found. " +
-                "Please set the desired port explicitly on HttpsRedirectionOptions.HttpsPort.", message.State.ToString());
+                "Set the desired port explicitly on HttpsRedirectionOptions.HttpsPort.", ex.Message);
         }
 
         [Fact]