Merge remote-tracking branch 'upstream/master' into network-rewrite

3 files changed, 92 insertions, 2 deletions

diff --git a/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs b/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
index e29167747..463ca7321 100644
--- a/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
+using Jellyfin.Api.Middleware;
 using Jellyfin.Networking.Configuration;
-using Jellyfin.Server.Middleware;
 using MediaBrowser.Controller.Configuration;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.OpenApi.Models;
diff --git a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
index e8a51c2aa..5065fbdbb 100644
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -20,13 +20,13 @@ using Jellyfin.Api.Auth.RequiresElevationPolicy;
 using Jellyfin.Api.Auth.SyncPlayAccessPolicy;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Controllers;
+using Jellyfin.Api.Formatters;
 using Jellyfin.Api.ModelBinders;
 using Jellyfin.Data.Enums;
 using Jellyfin.Extensions.Json;
 using Jellyfin.Networking.Configuration;
 using Jellyfin.Server.Configuration;
 using Jellyfin.Server.Filters;
-using Jellyfin.Server.Formatters;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Session;
diff --git a/Jellyfin.Server/Extensions/WebHostBuilderExtensions.cs b/Jellyfin.Server/Extensions/WebHostBuilderExtensions.cs
new file mode 100644
index 000000000..58d3e1b2d
--- /dev/null
+++ b/Jellyfin.Server/Extensions/WebHostBuilderExtensions.cs
@@ -0,0 +1,90 @@
+using System;
+using System.IO;
+using System.Net;
+using Jellyfin.Server.Helpers;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Extensions;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace Jellyfin.Server.Extensions;
+
+/// <summary>
+/// Extensions for configuring the web host builder.
+/// </summary>
+public static class WebHostBuilderExtensions
+{
+    /// <summary>
+    /// Configure the web host builder.
+    /// </summary>
+    /// <param name="builder">The builder to configure.</param>
+    /// <param name="appHost">The application host.</param>
+    /// <param name="startupConfig">The application configuration.</param>
+    /// <param name="appPaths">The application paths.</param>
+    /// <param name="logger">The logger.</param>
+    /// <returns>The configured web host builder.</returns>
+    public static IWebHostBuilder ConfigureWebHostBuilder(
+        this IWebHostBuilder builder,
+        CoreAppHost appHost,
+        IConfiguration startupConfig,
+        IApplicationPaths appPaths,
+        ILogger logger)
+    {
+        return builder
+            .UseKestrel((builderContext, options) =>
+            {
+                var addresses = appHost.NetManager.GetAllBindInterfaces();
+
+                bool flagged = false;
+                foreach (IPObject netAdd in addresses)
+                {
+                    logger.LogInformation("Kestrel listening on {Address}", IPAddress.IPv6Any.Equals(netAdd.Address) ? "All Addresses" : netAdd);
+                    options.Listen(netAdd.Address, appHost.HttpPort);
+                    if (appHost.ListenWithHttps)
+                    {
+                        options.Listen(
+                            netAdd.Address,
+                            appHost.HttpsPort,
+                            listenOptions => listenOptions.UseHttps(appHost.Certificate));
+                    }
+                    else if (builderContext.HostingEnvironment.IsDevelopment())
+                    {
+                        try
+                        {
+                            options.Listen(
+                                netAdd.Address,
+                                appHost.HttpsPort,
+                                listenOptions => listenOptions.UseHttps());
+                        }
+                        catch (InvalidOperationException)
+                        {
+                            if (!flagged)
+                            {
+                                logger.LogWarning("Failed to listen to HTTPS using the ASP.NET Core HTTPS development certificate. Please ensure it has been installed and set as trusted");
+                                flagged = true;
+                            }
+                        }
+                    }
+                }
+
+                // Bind to unix socket (only on unix systems)
+                if (startupConfig.UseUnixSocket() && Environment.OSVersion.Platform == PlatformID.Unix)
+                {
+                    var socketPath = StartupHelpers.GetUnixSocketPath(startupConfig, appPaths);
+
+                    // Workaround for https://github.com/aspnet/AspNetCore/issues/14134
+                    if (File.Exists(socketPath))
+                    {
+                        File.Delete(socketPath);
+                    }
+
+                    options.ListenUnixSocket(socketPath);
+                    logger.LogInformation("Kestrel listening to unix socket {SocketPath}", socketPath);
+                }
+            })
+            .UseStartup(_ => new Startup(appHost));
+    }
+}