From 64ffd5fd9526762e27d97e13c59cc6552c97e7bc Mon Sep 17 00:00:00 2001 From: Shadowghost Date: Wed, 20 Jul 2022 09:45:57 +0200 Subject: [PATCH] Move subnet parser to NetworkExtensions --- Jellyfin.Networking/Manager/NetworkManager.cs | 72 ++----------------- MediaBrowser.Common/Net/NetworkExtensions.cs | 58 ++++++++++++++- 2 files changed, 62 insertions(+), 68 deletions(-) diff --git a/Jellyfin.Networking/Manager/NetworkManager.cs b/Jellyfin.Networking/Manager/NetworkManager.cs index d9ef2c6a4c..e9e3e18022 100644 --- a/Jellyfin.Networking/Manager/NetworkManager.cs +++ b/Jellyfin.Networking/Manager/NetworkManager.cs @@ -326,8 +326,8 @@ namespace Jellyfin.Networking.Manager // Get configuration options string[] subnets = config.LocalNetworkSubnets; - _ = TryParseSubnets(subnets, out _lanSubnets, false); - _ = TryParseSubnets(subnets, out _excludedSubnets, true); + _ = NetworkExtensions.TryParseSubnets(subnets, out _lanSubnets, false); + _ = NetworkExtensions.TryParseSubnets(subnets, out _excludedSubnets, true); if (_lanSubnets.Count == 0) { @@ -419,7 +419,7 @@ namespace Jellyfin.Networking.Manager if (remoteIPFilter.Any() && !string.IsNullOrWhiteSpace(remoteIPFilter.First())) { // Parse all IPs with netmask to a subnet - _ = TryParseSubnets(remoteIPFilter.Where(x => x.Contains('/', StringComparison.OrdinalIgnoreCase)).ToArray(), out _remoteAddressFilter, false); + _ = NetworkExtensions.TryParseSubnets(remoteIPFilter.Where(x => x.Contains('/', StringComparison.OrdinalIgnoreCase)).ToArray(), out _remoteAddressFilter, false); // Parse everything else as an IP and construct subnet with a single IP var ips = remoteIPFilter.Where(x => !x.Contains('/', StringComparison.OrdinalIgnoreCase)); @@ -595,68 +595,6 @@ namespace Jellyfin.Networking.Manager return false; } - /// - /// Try parsing an array of strings into subnets, respecting exclusions. - /// - /// Input string to be parsed. - /// Collection of . - /// Boolean signaling if negated or not negated values should be parsed. - /// True if parsing was successful. - public bool TryParseSubnets(string[] values, out Collection result, bool negated = false) - { - result = new Collection(); - - if (values == null || values.Length == 0) - { - return false; - } - - for (int a = 0; a < values.Length; a++) - { - string[] v = values[a].Trim().Split("/"); - - try - { - var address = IPAddress.None; - if (negated && v[0].StartsWith('!')) - { - _ = IPAddress.TryParse(v[0][1..], out address); - } - else if (!negated) - { - _ = IPAddress.TryParse(v[0][0..], out address); - } - - if (address != IPAddress.None && address != null) - { - if (int.TryParse(v[1], out var netmask)) - { - result.Add(new IPNetwork(address, netmask)); - } - else if (address.AddressFamily == AddressFamily.InterNetwork) - { - result.Add(new IPNetwork(address, 32)); - } - else if (address.AddressFamily == AddressFamily.InterNetworkV6) - { - result.Add(new IPNetwork(address, 128)); - } - } - } - catch (ArgumentException e) - { - _logger.LogWarning(e, "Ignoring LAN value {Value}.", v); - } - } - - if (result.Count > 0) - { - return true; - } - - return false; - } - /// public bool HasRemoteAccess(IPAddress remoteIp) { @@ -802,12 +740,12 @@ namespace Jellyfin.Networking.Manager if (source != null) { - if (IsIpv4Enabled && source.AddressFamily == AddressFamily.InterNetworkV6) + if (IsIpv4Enabled && !IsIpv6Enabled && source.AddressFamily == AddressFamily.InterNetworkV6) { _logger.LogWarning("IPv6 is disabled in Jellyfin, but enabled in the OS. This may affect how the interface is selected."); } - if (IsIpv6Enabled && source.AddressFamily == AddressFamily.InterNetwork) + if (!IsIpv4Enabled && IsIpv6Enabled && source.AddressFamily == AddressFamily.InterNetwork) { _logger.LogWarning("IPv4 is disabled in Jellyfin, but enabled in the OS. This may affect how the interface is selected."); } diff --git a/MediaBrowser.Common/Net/NetworkExtensions.cs b/MediaBrowser.Common/Net/NetworkExtensions.cs index 55ec322f43..4cba1c99f2 100644 --- a/MediaBrowser.Common/Net/NetworkExtensions.cs +++ b/MediaBrowser.Common/Net/NetworkExtensions.cs @@ -1,5 +1,6 @@ +using Microsoft.AspNetCore.HttpOverrides; using System; -using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Diagnostics.CodeAnalysis; using System.Net; using System.Net.Sockets; @@ -136,6 +137,61 @@ namespace MediaBrowser.Common.Net return str; } + /// + /// Try parsing an array of strings into subnets, respecting exclusions. + /// + /// Input string to be parsed. + /// Collection of . + /// Boolean signaling if negated or not negated values should be parsed. + /// True if parsing was successful. + public static bool TryParseSubnets(string[] values, out Collection result, bool negated = false) + { + result = new Collection(); + + if (values == null || values.Length == 0) + { + return false; + } + + for (int a = 0; a < values.Length; a++) + { + string[] v = values[a].Trim().Split("/"); + + var address = IPAddress.None; + if (negated && v[0].StartsWith('!')) + { + _ = IPAddress.TryParse(v[0][1..], out address); + } + else if (!negated) + { + _ = IPAddress.TryParse(v[0][0..], out address); + } + + if (address != IPAddress.None && address != null) + { + if (int.TryParse(v[1], out var netmask)) + { + result.Add(new IPNetwork(address, netmask)); + } + else if (address.AddressFamily == AddressFamily.InterNetwork) + { + result.Add(new IPNetwork(address, 32)); + } + else if (address.AddressFamily == AddressFamily.InterNetworkV6) + { + result.Add(new IPNetwork(address, 128)); + } + } + } + + if (result.Count > 0) + { + return true; + } + + return false; + } + /// /// Attempts to parse a host string. ///