Read HTTP_PORTS and HTTPS_PORTS into IServerAddresses dotnet#43135

Author: Tratcher

src/Hosting/Abstractions/src/PublicAPI.Unshipped.txt

@@ -1 +1,3 @@
 #nullable enable
+static readonly Microsoft.AspNetCore.Hosting.WebHostDefaults.HttpPortKey -> string!
+static readonly Microsoft.AspNetCore.Hosting.WebHostDefaults.HttpsPortKey -> string!

src/Hosting/Abstractions/src/WebHostDefaults.cs

@@ -53,6 +53,16 @@ public static class WebHostDefaults
     /// </summary>
     public static readonly string ServerUrlsKey = "urls";
 
+    /// <summary>
+    /// The configuration key associated with the "http_port" configuration.
+    /// </summary>
+    public static readonly string HttpPortKey = "http_port";
+
+    /// <summary>
+    /// The configuration key associated with the "https_port" configuration.
+    /// </summary>
+    public static readonly string HttpsPortKey = "https_port";
+
     /// <summary>
     /// The configuration key associated with the "ContentRoot" configuration.
     /// </summary>

src/Hosting/Hosting/src/GenericHost/GenericWebHostService.cs

@@ -73,6 +73,18 @@ public async Task StartAsync(CancellationToken cancellationToken)
                 urls = Options.WebHostOptions.ServerUrls;
             }
 
+            if (string.IsNullOrEmpty(urls))
+            {
+                // HTTP_PORTS and HTTPS_PORTS, these are lower priority than Urls.
+                var httpPorts = Configuration[WebHostDefaults.HttpPortKey];
+                var httpUrls = httpPorts?.Split(';', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)
+                    .Select(port => $"http://*:{port}").Aggregate((s1, s2) => string.Concat(s1, ";", s2));
+                var httpsPorts = Configuration[WebHostDefaults.HttpsPortKey];
+                var httpsUrls = httpsPorts?.Split(';', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)
+                    .Select(port => $"https://*:{port}").Aggregate((s1, s2) => string.Concat(s1, ";", s2));
+                urls = string.Join(';', httpUrls, httpsUrls);
+            }
+
             if (!string.IsNullOrEmpty(urls))
             {
                 // We support reading "preferHostingUrls" from app configuration

src/Hosting/Hosting/test/GenericWebHostBuilderTests.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Linq;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
 using Microsoft.AspNetCore.Http.Features;
@@ -87,6 +88,46 @@ public void UseUrlsWorksAfterHostConfigurationSourcesAreCleared()
         Assert.Equal("TEST_URL", server.Addresses.Single());
     }
 
+    [Theory]
+    [InlineData(null, null, null, "")]
+    [InlineData("", "", "", "")]
+    [InlineData("http://urls", "", "", "http://urls")]
+    [InlineData("http://urls", "5000", "", "http://urls")]
+    [InlineData("http://urls", "", "5001", "http://urls")]
+    [InlineData("http://urls", "5000", "5001", "http://urls")]
+    [InlineData("", "5000", "", "http://*:5000")]
+    [InlineData("", "5000;5002;5004", "", "http://*:5000;http://*:5002;http://*:5004")]
+    [InlineData("", "", "5001", "https://*:5001")]
+    [InlineData("", "", "5001;5003;5005", "https://*:5001;https://*:5003;https://*:5005")]
+    [InlineData("", "5000", "5001", "http://*:5000;https://*:5001")]
+    [InlineData("", "5000;5002", "5001;5003", "http://*:5000;http://*:5002;https://*:5001;https://*:5003")]
+    public void ReadsUrlsOrPorts(string urls, string httpPort, string httpsPort, string expected)
+    {
+        var server = new TestServer();
+
+        using var host = new HostBuilder()
+            .ConfigureHostConfiguration(config =>
+            {
+                config.AddInMemoryCollection(new[]
+                {
+                    new KeyValuePair<string, string>("urls", urls),
+                    new KeyValuePair<string, string>("http_port", httpPort),
+                    new KeyValuePair<string, string>("https_port", httpsPort),
+                });
+            })
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseServer(server)
+                    .Configure(_ => { });
+            })
+            .Build();
+
+        host.Start();
+
+        Assert.Equal(expected, string.Join(';', server.Addresses));
+    }
+
     private class TestServer : IServer, IServerAddressesFeature
     {
         public TestServer()