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

Reverted change to network manager

Browse Source
This commit is contained in:
JPVenson 2024-10-26 10:34:11 +00:00
parent 1e7acec017
commit cd81a698a6
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -921,19 +921,6 @@ public class NetworkManager : INetworkManager, IDisposable
/// <inheritdoc/>
public bool IsInLocalNetwork(IPAddress address)
{
return NetworkManager.IsInLocalNetwork(address, TrustAllIPv6Interfaces, _lanSubnets, _excludedSubnets);
}
/// <summary>
/// Checks a ip address to match any lansubnet given but not to be in any excluded subnet.
/// </summary>
/// <param name="address">The IP address to checl.</param>
/// <param name="trustAllIpv6">Whenever all IPV6 subnet address shall be permitted.</param>
/// <param name="lanSubnets">The list of subnets to permit.</param>
/// <param name="excludedSubnets">The list of subnets to never permit.</param>
/// <returns>The check if the given IP address is in any provided subnet.</returns>
public static bool IsInLocalNetwork(IPAddress address, bool trustAllIpv6, IReadOnlyList<IPNetwork> lanSubnets, IReadOnlyList<IPNetwork> excludedSubnets)
{
ArgumentNullException.ThrowIfNull(address);
@ -943,23 +930,23 @@ public class NetworkManager : INetworkManager, IDisposable
address = address.MapToIPv4();
}
if ((trustAllIpv6 && address.AddressFamily == AddressFamily.InterNetworkV6)
if ((TrustAllIPv6Interfaces && address.AddressFamily == AddressFamily.InterNetworkV6)
|| IPAddress.IsLoopback(address))
{
return true;
}
// As private addresses can be redefined by Configuration.LocalNetworkAddresses
return CheckIfLanAndNotExcluded(address, lanSubnets, excludedSubnets);
return CheckIfLanAndNotExcluded(address);
}
private static bool CheckIfLanAndNotExcluded(IPAddress address, IReadOnlyList<IPNetwork> lanSubnets, IReadOnlyList<IPNetwork> excludedSubnets)
private bool CheckIfLanAndNotExcluded(IPAddress address)
{
foreach (var lanSubnet in lanSubnets)
foreach (var lanSubnet in _lanSubnets)
{
if (lanSubnet.Contains(address))
{
foreach (var excludedSubnet in excludedSubnets)
foreach (var excludedSubnet in _excludedSubnets)
{
if (excludedSubnet.Contains(address))
{