Merge branch 'master' into network-rewrite

1 files changed, 31 insertions, 27 deletions

diff --git a/Jellyfin.Api/Middleware/LanFilteringMiddleware.cs b/Jellyfin.Api/Middleware/LanFilteringMiddleware.cs
index 18f13bbce..9c2194faf 100644
--- a/Jellyfin.Api/Middleware/LanFilteringMiddleware.cs
+++ b/Jellyfin.Api/Middleware/LanFilteringMiddleware.cs
@@ -1,45 +1,49 @@
-using System.Net;
 using System.Threading.Tasks;
 using Jellyfin.Networking.Configuration;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using Microsoft.AspNetCore.Http;
 
-namespace Jellyfin.Api.Middleware
+namespace Jellyfin.Api.Middleware;
+
+/// <summary>
+/// Validates the LAN host IP based on application configuration.
+/// </summary>
+public class LanFilteringMiddleware
 {
+    private readonly RequestDelegate _next;
+
     /// <summary>
-    /// Validates the LAN host IP based on application configuration.
+    /// Initializes a new instance of the <see cref="LanFilteringMiddleware"/> class.
     /// </summary>
-    public class LanFilteringMiddleware
+    /// <param name="next">The next delegate in the pipeline.</param>
+    public LanFilteringMiddleware(RequestDelegate next)
     {
-        private readonly RequestDelegate _next;
+        _next = next;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LanFilteringMiddleware"/> class.
-        /// </summary>
-        /// <param name="next">The next delegate in the pipeline.</param>
-        public LanFilteringMiddleware(RequestDelegate next)
+    /// <summary>
+    /// Executes the middleware action.
+    /// </summary>
+    /// <param name="httpContext">The current HTTP context.</param>
+    /// <param name="networkManager">The network manager.</param>
+    /// <param name="serverConfigurationManager">The server configuration manager.</param>
+    /// <returns>The async task.</returns>
+    public async Task Invoke(HttpContext httpContext, INetworkManager networkManager, IServerConfigurationManager serverConfigurationManager)
+    {
+        if (serverConfigurationManager.GetNetworkConfiguration().EnableRemoteAccess)
         {
-            _next = next;
+            await _next(httpContext).ConfigureAwait(false);
+            return;
         }
 
-        /// <summary>
-        /// Executes the middleware action.
-        /// </summary>
-        /// <param name="httpContext">The current HTTP context.</param>
-        /// <param name="networkManager">The network manager.</param>
-        /// <param name="serverConfigurationManager">The server configuration manager.</param>
-        /// <returns>The async task.</returns>
-        public async Task Invoke(HttpContext httpContext, INetworkManager networkManager, IServerConfigurationManager serverConfigurationManager)
+        var host = httpContext.GetNormalizedRemoteIp();
+        if (!networkManager.IsInLocalNetwork(host))
         {
-            var host = httpContext.Connection.RemoteIpAddress ?? IPAddress.Loopback;
-
-            if (!networkManager.IsInLocalNetwork(host) && !serverConfigurationManager.GetNetworkConfiguration().EnableRemoteAccess)
-            {
-                return;
-            }
-
-            await _next(httpContext).ConfigureAwait(false);
+            return;
         }
+
+        await _next(httpContext).ConfigureAwait(false);
     }
 }