Browse Source

Fix the test

cvium 4 years ago
parent
commit
cb173d79e6

+ 0 - 5
Jellyfin.Api/Helpers/RequestHelpers.cs

@@ -173,10 +173,5 @@ namespace Jellyfin.Api.Helpers
                 .Select(i => i!.Value)
                 .ToArray();
         }
-
-        internal static IPAddress NormalizeIp(IPAddress ip)
-        {
-            return ip.IsIPv4MappedToIPv6 ? ip.MapToIPv4() : ip;
-        }
     }
 }

+ 3 - 1
MediaBrowser.Common/Extensions/HttpContextExtensions.cs

@@ -1,3 +1,4 @@
+using System.Net;
 using Microsoft.AspNetCore.Http;
 
 namespace MediaBrowser.Common.Extensions
@@ -26,7 +27,8 @@ namespace MediaBrowser.Common.Extensions
         /// <returns>The remote caller IP address.</returns>
         public static string GetNormalizedRemoteIp(this HttpContext context)
         {
-            var ip = context.Connection.RemoteIpAddress;
+            // Default to the loopback address if no RemoteIpAddress is specified (i.e. during integration tests)
+            var ip = context.Connection.RemoteIpAddress ?? IPAddress.Loopback;
 
             if (ip.IsIPv4MappedToIPv6)
             {