Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-29 04:10:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16672 from dwandw/fix-ipv6-prefixes-not-recognized-as-proxy

Browse Source 
Fix IPv6 prefixes not recognized as proxy
This commit is contained in:
Bond-009 2026-04-28 20:21:07 +02:00 committed by GitHub
commit b733857da2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS.md
View File

@ -228,6 +228,7 @@
- [MarcoCoreDuo](https://github.com/MarcoCoreDuo)
- [LiHRaM](https://github.com/LiHRaM)
- [MSalman5230](https://github.com/MSalman5230)
- [dwandw](https://github.com/dwandw)
# Emby Contributors

2
Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
View File

@ -312,7 +312,7 @@ namespace Jellyfin.Server.Extensions
return;
}
if (prefixLength == NetworkConstants.MinimumIPv4PrefixSize)
if ((addr.AddressFamily == AddressFamily.InterNetwork && prefixLength == NetworkConstants.MinimumIPv4PrefixSize) || (addr.AddressFamily == AddressFamily.InterNetworkV6 && prefixLength == NetworkConstants.MinimumIPv6PrefixSize))
{
options.KnownProxies.Add(addr);
}

16
tests/Jellyfin.Server.Tests/ParseNetworkTests.cs
View File

@ -23,8 +23,8 @@ namespace Jellyfin.Server.Tests
true,
true,
new string[] { "192.168.t", "127.0.0.1", "::1", "1234.1232.12.1234" },
new IPAddress[] { IPAddress.Loopback },
new IPNetwork[] { new IPNetwork(IPAddress.IPv6Loopback, 128) });
new IPAddress[] { IPAddress.Loopback, IPAddress.IPv6Loopback },
Array.Empty<IPNetwork>());
data.Add(
true,
@ -37,8 +37,8 @@ namespace Jellyfin.Server.Tests
true,
true,
new string[] { "::1" },
Array.Empty<IPAddress>(),
new IPNetwork[] { new IPNetwork(IPAddress.IPv6Loopback, 128) });
new IPAddress[] { IPAddress.IPv6Loopback },
Array.Empty<IPNetwork>());
data.Add(
false,
@ -58,15 +58,15 @@ namespace Jellyfin.Server.Tests
false,
true,
new string[] { "localhost" },
Array.Empty<IPAddress>(),
new IPNetwork[] { new IPNetwork(IPAddress.IPv6Loopback, 128) });
new IPAddress[] { IPAddress.IPv6Loopback },
Array.Empty<IPNetwork>());
data.Add(
true,
true,
new string[] { "localhost" },
new IPAddress[] { IPAddress.Loopback },
new IPNetwork[] { new IPNetwork(IPAddress.IPv6Loopback, 128) });
new IPAddress[] { IPAddress.Loopback, IPAddress.IPv6Loopback },
Array.Empty<IPNetwork>());
return data;
}