Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Backport pull request #12094 from jellyfin/release-10.9.z

Browse Source 
Map IPv6 mapped IPv4 addresses back to IPv4 before running checks

Original-merge: f097aad01e6992d9f65d1cfe32e569a785e2918c

Merged-by: Bond-009 <bond.009@outlook.com>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Shadowghost 2024-06-23 11:40:54 -04:00 committed by Joshua M. Boniface
parent 034c13c48f
commit 9c96ce5f6e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Jellyfin.Networking/Manager/NetworkManager.cs
View File

@ -919,10 +919,14 @@ public class NetworkManager : INetworkManager, IDisposable
{ {
ArgumentNullException.ThrowIfNull(address); ArgumentNullException.ThrowIfNull(address);
// See conversation at https://github.com/jellyfin/jellyfin/pull/3515. // Map IPv6 mapped IPv4 back to IPv4 (happens if Kestrel runs in dual-socket mode)
if (address.IsIPv4MappedToIPv6)
{
address = address.MapToIPv4();
}
if ((TrustAllIPv6Interfaces && address.AddressFamily == AddressFamily.InterNetworkV6) if ((TrustAllIPv6Interfaces && address.AddressFamily == AddressFamily.InterNetworkV6)
|| address.Equals(IPAddress.Loopback) || IPAddress.IsLoopback(address))
|| address.Equals(IPAddress.IPv6Loopback))
{ {
return true; return true;
} }