aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/Jellyfin.Networking.Tests/IPNetAddressTests.cs49
-rw-r--r--tests/Jellyfin.Networking.Tests/NetworkExtensionsTests.cs (renamed from tests/Jellyfin.Networking.Tests/IPHostTests.cs)10
-rw-r--r--tests/Jellyfin.Networking.Tests/NetworkManagerTests.cs8
-rw-r--r--tests/Jellyfin.Networking.Tests/NetworkParseTests.cs308
-rw-r--r--tests/Jellyfin.Server.Tests/ParseNetworkTests.cs16
5 files changed, 110 insertions, 281 deletions
diff --git a/tests/Jellyfin.Networking.Tests/IPNetAddressTests.cs b/tests/Jellyfin.Networking.Tests/IPNetAddressTests.cs
deleted file mode 100644
index aa2dbc57a..000000000
--- a/tests/Jellyfin.Networking.Tests/IPNetAddressTests.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using FsCheck;
-using FsCheck.Xunit;
-using MediaBrowser.Common.Net;
-using Xunit;
-
-namespace Jellyfin.Networking.Tests
-{
- public static class IPNetAddressTests
- {
- /// <summary>
- /// Checks IP address formats.
- /// </summary>
- /// <param name="address">IP Address.</param>
- [Theory]
- [InlineData("127.0.0.1")]
- [InlineData("fd23:184f:2029:0:3139:7386:67d7:d517")]
- [InlineData("fd23:184f:2029:0:3139:7386:67d7:d517/56")]
- [InlineData("[fd23:184f:2029:0:3139:7386:67d7:d517]")]
- [InlineData("fe80::7add:12ff:febb:c67b%16")]
- [InlineData("[fe80::7add:12ff:febb:c67b%16]:123")]
- [InlineData("fe80::7add:12ff:febb:c67b%16:123")]
- [InlineData("[fe80::7add:12ff:febb:c67b%16]")]
- [InlineData("192.168.1.2/255.255.255.0")]
- [InlineData("192.168.1.2/24")]
- public static void TryParse_ValidIPStrings_True(string address)
- => Assert.True(IPNetAddress.TryParse(address, out _));
-
- [Property]
- public static Property TryParse_IPv4Address_True(IPv4Address address)
- => IPNetAddress.TryParse(address.Item.ToString(), out _).ToProperty();
-
- [Property]
- public static Property TryParse_IPv6Address_True(IPv6Address address)
- => IPNetAddress.TryParse(address.Item.ToString(), out _).ToProperty();
-
- /// <summary>
- /// All should be invalid address strings.
- /// </summary>
- /// <param name="address">Invalid address strings.</param>
- [Theory]
- [InlineData("256.128.0.0.0.1")]
- [InlineData("127.0.0.1#")]
- [InlineData("localhost!")]
- [InlineData("fd23:184f:2029:0:3139:7386:67d7:d517:1231")]
- [InlineData("[fd23:184f:2029:0:3139:7386:67d7:d517:1231]")]
- public static void TryParse_InvalidAddressString_False(string address)
- => Assert.False(IPNetAddress.TryParse(address, out _));
- }
-}
diff --git a/tests/Jellyfin.Networking.Tests/IPHostTests.cs b/tests/Jellyfin.Networking.Tests/NetworkExtensionsTests.cs
index ec3a1300c..c81fdefe9 100644
--- a/tests/Jellyfin.Networking.Tests/IPHostTests.cs
+++ b/tests/Jellyfin.Networking.Tests/NetworkExtensionsTests.cs
@@ -5,7 +5,7 @@ using Xunit;
namespace Jellyfin.Networking.Tests
{
- public static class IPHostTests
+ public static class NetworkExtensionsTests
{
/// <summary>
/// Checks IP address formats.
@@ -27,15 +27,15 @@ namespace Jellyfin.Networking.Tests
[InlineData("192.168.1.2/255.255.255.0")]
[InlineData("192.168.1.2/24")]
public static void TryParse_ValidHostStrings_True(string address)
- => Assert.True(IPHost.TryParse(address, out _));
+ => Assert.True(NetworkExtensions.TryParseHost(address, out _, true, true));
[Property]
public static Property TryParse_IPv4Address_True(IPv4Address address)
- => IPHost.TryParse(address.Item.ToString(), out _).ToProperty();
+ => NetworkExtensions.TryParseHost(address.Item.ToString(), out _, true, true).ToProperty();
[Property]
public static Property TryParse_IPv6Address_True(IPv6Address address)
- => IPHost.TryParse(address.Item.ToString(), out _).ToProperty();
+ => NetworkExtensions.TryParseHost(address.Item.ToString(), out _, true, true).ToProperty();
/// <summary>
/// All should be invalid address strings.
@@ -48,6 +48,6 @@ namespace Jellyfin.Networking.Tests
[InlineData("fd23:184f:2029:0:3139:7386:67d7:d517:1231")]
[InlineData("[fd23:184f:2029:0:3139:7386:67d7:d517:1231]")]
public static void TryParse_InvalidAddressString_False(string address)
- => Assert.False(IPHost.TryParse(address, out _));
+ => Assert.False(NetworkExtensions.TryParseHost(address, out _, true, true));
}
}
diff --git a/tests/Jellyfin.Networking.Tests/NetworkManagerTests.cs b/tests/Jellyfin.Networking.Tests/NetworkManagerTests.cs
index df2a2ca70..0b07a3c53 100644
--- a/tests/Jellyfin.Networking.Tests/NetworkManagerTests.cs
+++ b/tests/Jellyfin.Networking.Tests/NetworkManagerTests.cs
@@ -23,8 +23,8 @@ namespace Jellyfin.Networking.Tests
var ip = IPAddress.Parse(value);
var conf = new NetworkConfiguration()
{
- EnableIPV6 = true,
- EnableIPV4 = true,
+ EnableIPv6 = true,
+ EnableIPv4 = true,
LocalNetworkSubnets = network.Split(',')
};
@@ -51,8 +51,8 @@ namespace Jellyfin.Networking.Tests
var ip = IPAddress.Parse(value);
var conf = new NetworkConfiguration()
{
- EnableIPV6 = true,
- EnableIPV4 = true,
+ EnableIPv6 = true,
+ EnableIPv4 = true,
LocalNetworkSubnets = network.Split(',')
};
diff --git a/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs b/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs
index 8174632bb..77f18c544 100644
--- a/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs
+++ b/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs
@@ -1,10 +1,12 @@
using System;
-using System.Collections.ObjectModel;
+using System.Collections.Generic;
+using System.Linq;
using System.Net;
using Jellyfin.Networking.Configuration;
using Jellyfin.Networking.Manager;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Net;
+using MediaBrowser.Model.Net;
using Microsoft.Extensions.Logging.Abstractions;
using Moq;
using Xunit;
@@ -34,6 +36,8 @@ namespace Jellyfin.Networking.Tests
[InlineData("192.168.1.208/24,-16,eth16|200.200.200.200/24,11,eth11", "192.168.1.0/24;200.200.200.0/24", "[192.168.1.208/24,200.200.200.200/24]")]
// eth16 only
[InlineData("192.168.1.208/24,-16,eth16|200.200.200.200/24,11,eth11", "192.168.1.0/24", "[192.168.1.208/24]")]
+ // eth16 only without mask
+ [InlineData("192.168.1.208,-16,eth16|200.200.200.200,11,eth11", "192.168.1.0/24", "[192.168.1.208/32]")]
// All interfaces excluded. (including loopbacks)
[InlineData("192.168.1.208/24,-16,vEthernet1|192.168.2.208/24,-16,vEthernet212|200.200.200.200/24,11,eth11", "192.168.1.0/24", "[]")]
// vEthernet1 and vEthernet212 should be excluded.
@@ -44,8 +48,8 @@ namespace Jellyfin.Networking.Tests
{
var conf = new NetworkConfiguration()
{
- EnableIPV6 = true,
- EnableIPV4 = true,
+ EnableIPv6 = true,
+ EnableIPv4 = true,
LocalNetworkSubnets = lan?.Split(';') ?? throw new ArgumentNullException(nameof(lan))
};
@@ -53,162 +57,97 @@ namespace Jellyfin.Networking.Tests
using var nm = new NetworkManager(GetMockConfig(conf), new NullLogger<NetworkManager>());
NetworkManager.MockNetworkSettings = string.Empty;
- Assert.Equal(nm.GetInternalBindAddresses().AsString(), value);
+ Assert.Equal(value, "[" + string.Join(",", nm.GetInternalBindAddresses().Select(x => x.Address + "/" + x.Subnet.PrefixLength)) + "]");
}
/// <summary>
- /// Test collection parsing.
+ /// Checks valid IP address formats.
/// </summary>
- /// <param name="settings">Collection to parse.</param>
- /// <param name="result1">Included addresses from the collection.</param>
- /// <param name="result2">Included IP4 addresses from the collection.</param>
- /// <param name="result3">Excluded addresses from the collection.</param>
- /// <param name="result4">Excluded IP4 addresses from the collection.</param>
- /// <param name="result5">Network addresses of the collection.</param>
+ /// <param name="address">IP Address.</param>
[Theory]
- [InlineData(
- "127.0.0.1#",
- "[]",
- "[]",
- "[]",
- "[]",
- "[]")]
- [InlineData(
- "!127.0.0.1",
- "[]",
- "[]",
- "[127.0.0.1/32]",
- "[127.0.0.1/32]",
- "[]")]
- [InlineData(
- "",
- "[]",
- "[]",
- "[]",
- "[]",
- "[]")]
- [InlineData(
- "192.158.1.2/16, localhost, fd23:184f:2029:0:3139:7386:67d7:d517, !10.10.10.10",
- "[192.158.1.2/16,[127.0.0.1/32,::1/128],fd23:184f:2029:0:3139:7386:67d7:d517/128]",
- "[192.158.1.2/16,127.0.0.1/32]",
- "[10.10.10.10/32]",
- "[10.10.10.10/32]",
- "[192.158.0.0/16,127.0.0.1/32,::1/128,fd23:184f:2029:0:3139:7386:67d7:d517/128]")]
- [InlineData(
- "192.158.1.2/255.255.0.0,192.169.1.2/8",
- "[192.158.1.2/16,192.169.1.2/8]",
- "[192.158.1.2/16,192.169.1.2/8]",
- "[]",
- "[]",
- "[192.158.0.0/16,192.0.0.0/8]")]
- public void TestCollections(string settings, string result1, string result2, string result3, string result4, string result5)
- {
- ArgumentNullException.ThrowIfNull(settings);
-
- var conf = new NetworkConfiguration()
- {
- EnableIPV6 = true,
- EnableIPV4 = true,
- };
-
- using var nm = new NetworkManager(GetMockConfig(conf), new NullLogger<NetworkManager>());
-
- // Test included.
- Collection<IPObject> nc = nm.CreateIPCollection(settings.Split(','), false);
- Assert.Equal(nc.AsString(), result1);
-
- // Test excluded.
- nc = nm.CreateIPCollection(settings.Split(','), true);
- Assert.Equal(nc.AsString(), result3);
-
- conf.EnableIPV6 = false;
- nm.UpdateSettings(conf);
-
- // Test IP4 included.
- nc = nm.CreateIPCollection(settings.Split(','), false);
- Assert.Equal(nc.AsString(), result2);
-
- // Test IP4 excluded.
- nc = nm.CreateIPCollection(settings.Split(','), true);
- Assert.Equal(nc.AsString(), result4);
-
- conf.EnableIPV6 = true;
- nm.UpdateSettings(conf);
-
- // Test network addresses of collection.
- nc = nm.CreateIPCollection(settings.Split(','), false);
- nc = nc.AsNetworks();
- Assert.Equal(nc.AsString(), result5);
- }
+ [InlineData("127.0.0.1")]
+ [InlineData("127.0.0.1/8")]
+ [InlineData("192.168.1.2")]
+ [InlineData("192.168.1.2/24")]
+ [InlineData("192.168.1.2/255.255.255.0")]
+ [InlineData("fd23:184f:2029:0:3139:7386:67d7:d517")]
+ [InlineData("[fd23:184f:2029:0:3139:7386:67d7:d517]")]
+ [InlineData("fe80::7add:12ff:febb:c67b%16")]
+ [InlineData("[fe80::7add:12ff:febb:c67b%16]:123")]
+ [InlineData("fe80::7add:12ff:febb:c67b%16:123")]
+ [InlineData("[fe80::7add:12ff:febb:c67b%16]")]
+ [InlineData("fd23:184f:2029:0:3139:7386:67d7:d517/56")]
+ public static void TryParseValidIPStringsTrue(string address)
+ => Assert.True(NetworkExtensions.TryParseToSubnet(address, out _));
/// <summary>
- /// Union two collections.
+ /// Checks invalid IP address formats.
/// </summary>
- /// <param name="settings">Source.</param>
- /// <param name="compare">Destination.</param>
- /// <param name="result">Result.</param>
+ /// <param name="address">IP Address.</param>
[Theory]
- [InlineData("127.0.0.1", "fd23:184f:2029:0:3139:7386:67d7:d517/64,fd23:184f:2029:0:c0f0:8a8a:7605:fffa/128,fe80::3139:7386:67d7:d517%16/64,192.168.1.208/24,::1/128,127.0.0.1/8", "[127.0.0.1/32]")]
- [InlineData("127.0.0.1", "127.0.0.1/8", "[127.0.0.1/32]")]
- public void UnionCheck(string settings, string compare, string result)
- {
- ArgumentNullException.ThrowIfNull(settings);
-
- ArgumentNullException.ThrowIfNull(compare);
-
- ArgumentNullException.ThrowIfNull(result);
-
- var conf = new NetworkConfiguration()
- {
- EnableIPV6 = true,
- EnableIPV4 = true,
- };
-
- using var nm = new NetworkManager(GetMockConfig(conf), new NullLogger<NetworkManager>());
-
- Collection<IPObject> nc1 = nm.CreateIPCollection(settings.Split(','), false);
- Collection<IPObject> nc2 = nm.CreateIPCollection(compare.Split(','), false);
-
- Assert.Equal(nc1.ThatAreContainedInNetworks(nc2).AsString(), result);
- }
+ [InlineData("127.0.0.1#")]
+ [InlineData("localhost!")]
+ [InlineData("256.128.0.0.0.1")]
+ [InlineData("fd23:184f:2029:0:3139:7386:67d7:d517:1231")]
+ [InlineData("[fd23:184f:2029:0:3139:7386:67d7:d517:1231]")]
+ public static void TryParseInvalidIPStringsFalse(string address)
+ => Assert.False(NetworkExtensions.TryParseToSubnet(address, out _));
+ /// <summary>
+ /// Checks if IPv4 address is within a defined subnet.
+ /// </summary>
+ /// <param name="netMask">Network mask.</param>
+ /// <param name="IPAddress">IP Address.</param>
[Theory]
[InlineData("192.168.5.85/24", "192.168.5.1")]
[InlineData("192.168.5.85/24", "192.168.5.254")]
+ [InlineData("192.168.5.85/255.255.255.0", "192.168.5.254")]
[InlineData("10.128.240.50/30", "10.128.240.48")]
[InlineData("10.128.240.50/30", "10.128.240.49")]
[InlineData("10.128.240.50/30", "10.128.240.50")]
[InlineData("10.128.240.50/30", "10.128.240.51")]
+ [InlineData("10.128.240.50/255.255.255.252", "10.128.240.51")]
[InlineData("127.0.0.1/8", "127.0.0.1")]
- public void IpV4SubnetMaskMatchesValidIpAddress(string netMask, string ipAddress)
+ public void IPv4SubnetMaskMatchesValidIPAddress(string netMask, string ipAddress)
{
- var ipAddressObj = IPNetAddress.Parse(netMask);
- Assert.True(ipAddressObj.Contains(IPAddress.Parse(ipAddress)));
+ var ipa = IPAddress.Parse(ipAddress);
+ Assert.True(NetworkExtensions.TryParseToSubnet(netMask, out var subnet) && subnet.Contains(IPAddress.Parse(ipAddress)));
}
+ /// <summary>
+ /// Checks if IPv4 address is not within a defined subnet.
+ /// </summary>
+ /// <param name="netMask">Network mask.</param>
+ /// <param name="ipAddress">IP Address.</param>
[Theory]
[InlineData("192.168.5.85/24", "192.168.4.254")]
[InlineData("192.168.5.85/24", "191.168.5.254")]
+ [InlineData("192.168.5.85/255.255.255.252", "192.168.4.254")]
[InlineData("10.128.240.50/30", "10.128.240.47")]
[InlineData("10.128.240.50/30", "10.128.240.52")]
[InlineData("10.128.240.50/30", "10.128.239.50")]
[InlineData("10.128.240.50/30", "10.127.240.51")]
- public void IpV4SubnetMaskDoesNotMatchInvalidIpAddress(string netMask, string ipAddress)
+ [InlineData("10.128.240.50/255.255.255.252", "10.127.240.51")]
+ public void IPv4SubnetMaskDoesNotMatchInvalidIPAddress(string netMask, string ipAddress)
{
- var ipAddressObj = IPNetAddress.Parse(netMask);
- Assert.False(ipAddressObj.Contains(IPAddress.Parse(ipAddress)));
+ var ipa = IPAddress.Parse(ipAddress);
+ Assert.False(NetworkExtensions.TryParseToSubnet(netMask, out var subnet) && subnet.Contains(IPAddress.Parse(ipAddress)));
}
+ /// <summary>
+ /// Checks if IPv6 address is within a defined subnet.
+ /// </summary>
+ /// <param name="netMask">Network mask.</param>
+ /// <param name="ipAddress">IP Address.</param>
[Theory]
[InlineData("2001:db8:abcd:0012::0/64", "2001:0DB8:ABCD:0012:0000:0000:0000:0000")]
[InlineData("2001:db8:abcd:0012::0/64", "2001:0DB8:ABCD:0012:FFFF:FFFF:FFFF:FFFF")]
[InlineData("2001:db8:abcd:0012::0/64", "2001:0DB8:ABCD:0012:0001:0000:0000:0000")]
[InlineData("2001:db8:abcd:0012::0/64", "2001:0DB8:ABCD:0012:FFFF:FFFF:FFFF:FFF0")]
[InlineData("2001:db8:abcd:0012::0/128", "2001:0DB8:ABCD:0012:0000:0000:0000:0000")]
- public void IpV6SubnetMaskMatchesValidIpAddress(string netMask, string ipAddress)
+ public void IPv6SubnetMaskMatchesValidIPAddress(string netMask, string ipAddress)
{
- var ipAddressObj = IPNetAddress.Parse(netMask);
- Assert.True(ipAddressObj.Contains(IPAddress.Parse(ipAddress)));
+ Assert.True(NetworkExtensions.TryParseToSubnet(netMask, out var subnet) && subnet.Contains(IPAddress.Parse(ipAddress)));
}
[Theory]
@@ -217,79 +156,16 @@ namespace Jellyfin.Networking.Tests
[InlineData("2001:db8:abcd:0012::0/64", "2001:0DB8:ABCD:0013:0001:0000:0000:0000")]
[InlineData("2001:db8:abcd:0012::0/64", "2001:0DB8:ABCD:0011:FFFF:FFFF:FFFF:FFF0")]
[InlineData("2001:db8:abcd:0012::0/128", "2001:0DB8:ABCD:0012:0000:0000:0000:0001")]
- public void IpV6SubnetMaskDoesNotMatchInvalidIpAddress(string netMask, string ipAddress)
+ public void IPv6SubnetMaskDoesNotMatchInvalidIPAddress(string netMask, string ipAddress)
{
- var ipAddressObj = IPNetAddress.Parse(netMask);
- Assert.False(ipAddressObj.Contains(IPAddress.Parse(ipAddress)));
+ Assert.False(NetworkExtensions.TryParseToSubnet(netMask, out var subnet) && subnet.Contains(IPAddress.Parse(ipAddress)));
}
[Theory]
- [InlineData("10.0.0.0/255.0.0.0", "10.10.10.1/32")]
- [InlineData("10.0.0.0/8", "10.10.10.1/32")]
- [InlineData("10.0.0.0/255.0.0.0", "10.10.10.1")]
-
- [InlineData("10.10.0.0/255.255.0.0", "10.10.10.1/32")]
- [InlineData("10.10.0.0/16", "10.10.10.1/32")]
- [InlineData("10.10.0.0/255.255.0.0", "10.10.10.1")]
-
- [InlineData("10.10.10.0/255.255.255.0", "10.10.10.1/32")]
- [InlineData("10.10.10.0/24", "10.10.10.1/32")]
- [InlineData("10.10.10.0/255.255.255.0", "10.10.10.1")]
-
- public void TestSubnetContains(string network, string ip)
- {
- Assert.True(IPNetAddress.TryParse(network, out var networkObj));
- Assert.True(IPNetAddress.TryParse(ip, out var ipObj));
- Assert.True(networkObj.Contains(ipObj));
- }
-
- [Theory]
- [InlineData("192.168.1.2/24,10.10.10.1/24,172.168.1.2/24", "172.168.1.2/24", "172.168.1.2/24")]
- [InlineData("192.168.1.2/24,10.10.10.1/24,172.168.1.2/24", "172.168.1.2/24, 10.10.10.1", "172.168.1.2/24,10.10.10.1/24")]
- [InlineData("192.168.1.2/24,10.10.10.1/24,172.168.1.2/24", "192.168.1.2/255.255.255.0, 10.10.10.1", "192.168.1.2/24,10.10.10.1/24")]
- [InlineData("192.168.1.2/24,10.10.10.1/24,172.168.1.2/24", "192.168.1.2/24, 100.10.10.1", "192.168.1.2/24")]
- [InlineData("192.168.1.2/24,10.10.10.1/24,172.168.1.2/24", "194.168.1.2/24, 100.10.10.1", "")]
-
- public void TestCollectionEquality(string source, string dest, string result)
- {
- ArgumentNullException.ThrowIfNull(source);
-
- ArgumentNullException.ThrowIfNull(dest);
-
- ArgumentNullException.ThrowIfNull(result);
-
- var conf = new NetworkConfiguration()
- {
- EnableIPV6 = true,
- EnableIPV4 = true
- };
-
- using var nm = new NetworkManager(GetMockConfig(conf), new NullLogger<NetworkManager>());
-
- // Test included, IP6.
- Collection<IPObject> ncSource = nm.CreateIPCollection(source.Split(','));
- Collection<IPObject> ncDest = nm.CreateIPCollection(dest.Split(','));
- Collection<IPObject> ncResult = ncSource.ThatAreContainedInNetworks(ncDest);
- Collection<IPObject> resultCollection = nm.CreateIPCollection(result.Split(','));
- Assert.True(ncResult.Compare(resultCollection));
- }
-
- [Theory]
- [InlineData("10.1.1.1/32", "10.1.1.1")]
- [InlineData("192.168.1.254/32", "192.168.1.254/255.255.255.255")]
-
- public void TestEquals(string source, string dest)
- {
- Assert.True(IPNetAddress.Parse(source).Equals(IPNetAddress.Parse(dest)));
- Assert.True(IPNetAddress.Parse(dest).Equals(IPNetAddress.Parse(source)));
- }
-
- [Theory]
-
// Testing bind interfaces.
// On my system eth16 is internal, eth11 external (Windows defines the indexes).
//
- // This test is to replicate how DNLA requests work throughout the system.
+ // This test is to replicate how DLNA requests work throughout the system.
// User on internal network, we're bound internal and external - so result is internal.
[InlineData("192.168.1.1", "eth16,eth11", false, "eth16")]
@@ -319,23 +195,24 @@ namespace Jellyfin.Networking.Tests
var conf = new NetworkConfiguration()
{
LocalNetworkAddresses = bindAddresses.Split(','),
- EnableIPV6 = ipv6enabled,
- EnableIPV4 = true
+ EnableIPv6 = ipv6enabled,
+ EnableIPv4 = true
};
NetworkManager.MockNetworkSettings = "192.168.1.208/24,-16,eth16|200.200.200.200/24,11,eth11";
using var nm = new NetworkManager(GetMockConfig(conf), new NullLogger<NetworkManager>());
NetworkManager.MockNetworkSettings = string.Empty;
- _ = nm.TryParseInterface(result, out Collection<IPObject>? resultObj);
-
- // Check to see if dns resolution is working. If not, skip test.
- _ = IPHost.TryParse(source, out var host);
+ // Check to see if DNS resolution is working. If not, skip test.
+ if (!NetworkExtensions.TryParseHost(source, out var host))
+ {
+ return;
+ }
- if (resultObj is not null && host?.HasAddress == true)
+ if (nm.TryParseInterface(result, out var resultObj))
{
- result = ((IPNetAddress)resultObj[0]).ToString(true);
- var intf = nm.GetBindInterface(source, out _);
+ result = resultObj.First().Address.ToString();
+ var intf = nm.GetBindAddress(source, out _);
Assert.Equal(intf, result);
}
@@ -363,8 +240,8 @@ namespace Jellyfin.Networking.Tests
// User on external network, internal binding only - so assumption is a proxy forward, return external override.
[InlineData("jellyfin.org", "192.168.1.0/24", "eth16", false, "0.0.0.0=http://helloworld.com", "http://helloworld.com")]
- // User on external network, no binding - so result is the 1st external which is overridden.
- [InlineData("jellyfin.org", "192.168.1.0/24", "", false, "0.0.0.0 = http://helloworld.com", "http://helloworld.com")]
+ // User on external network, no binding - so result is the 1st external which is overriden.
+ [InlineData("jellyfin.org", "192.168.1.0/24", "", false, "0.0.0.0=http://helloworld.com", "http://helloworld.com")]
// User assumed to be internal, no binding - so result is the 1st internal.
[InlineData("", "192.168.1.0/24", "", false, "0.0.0.0=http://helloworld.com", "eth16")]
@@ -381,8 +258,8 @@ namespace Jellyfin.Networking.Tests
{
LocalNetworkSubnets = lan.Split(','),
LocalNetworkAddresses = bindAddresses.Split(','),
- EnableIPV6 = ipv6enabled,
- EnableIPV4 = true,
+ EnableIPv6 = ipv6enabled,
+ EnableIPv4 = true,
PublishedServerUriBySubnet = new string[] { publishedServers }
};
@@ -390,15 +267,15 @@ namespace Jellyfin.Networking.Tests
using var nm = new NetworkManager(GetMockConfig(conf), new NullLogger<NetworkManager>());
NetworkManager.MockNetworkSettings = string.Empty;
- if (nm.TryParseInterface(result, out Collection<IPObject>? resultObj) && resultObj is not null)
+ if (nm.TryParseInterface(result, out IReadOnlyList<IPData>? resultObj) && resultObj is not null)
{
- // Parse out IPAddresses so we can do a string comparison. (Ignore subnet masks).
- result = ((IPNetAddress)resultObj[0]).ToString(true);
+ // Parse out IPAddresses so we can do a string comparison (ignore subnet masks).
+ result = resultObj.First().Address.ToString();
}
- var intf = nm.GetBindInterface(source, out int? _);
+ var intf = nm.GetBindAddress(source, out int? _);
- Assert.Equal(intf, result);
+ Assert.Equal(result, intf);
}
[Theory]
@@ -406,39 +283,40 @@ namespace Jellyfin.Networking.Tests
[InlineData("185.10.10.10", "185.10.10.10", false)]
[InlineData("", "100.100.100.100", false)]
- public void HasRemoteAccess_GivenWhitelist_AllowsOnlyIpsInWhitelist(string addresses, string remoteIp, bool denied)
+ public void HasRemoteAccess_GivenWhitelist_AllowsOnlyIPsInWhitelist(string addresses, string remoteIP, bool denied)
{
// Comma separated list of IP addresses or IP/netmask entries for networks that will be allowed to connect remotely.
// If left blank, all remote addresses will be allowed.
var conf = new NetworkConfiguration()
{
- EnableIPV4 = true,
+ EnableIPv4 = true,
RemoteIPFilter = addresses.Split(','),
IsRemoteIPFilterBlacklist = false
};
using var nm = new NetworkManager(GetMockConfig(conf), new NullLogger<NetworkManager>());
- Assert.NotEqual(nm.HasRemoteAccess(IPAddress.Parse(remoteIp)), denied);
+ Assert.NotEqual(nm.HasRemoteAccess(IPAddress.Parse(remoteIP)), denied);
}
[Theory]
[InlineData("185.10.10.10", "79.2.3.4", false)]
[InlineData("185.10.10.10", "185.10.10.10", true)]
[InlineData("", "100.100.100.100", false)]
- public void HasRemoteAccess_GivenBlacklist_BlacklistTheIps(string addresses, string remoteIp, bool denied)
+
+ public void HasRemoteAccess_GivenBlacklist_BlacklistTheIPs(string addresses, string remoteIP, bool denied)
{
// Comma separated list of IP addresses or IP/netmask entries for networks that will be allowed to connect remotely.
// If left blank, all remote addresses will be allowed.
var conf = new NetworkConfiguration()
{
- EnableIPV4 = true,
+ EnableIPv4 = true,
RemoteIPFilter = addresses.Split(','),
IsRemoteIPFilterBlacklist = true
};
using var nm = new NetworkManager(GetMockConfig(conf), new NullLogger<NetworkManager>());
- Assert.NotEqual(nm.HasRemoteAccess(IPAddress.Parse(remoteIp)), denied);
+ Assert.NotEqual(nm.HasRemoteAccess(IPAddress.Parse(remoteIP)), denied);
}
[Theory]
@@ -450,7 +328,7 @@ namespace Jellyfin.Networking.Tests
{
var conf = new NetworkConfiguration
{
- EnableIPV4 = true,
+ EnableIPv4 = true,
LocalNetworkSubnets = lan.Split(','),
LocalNetworkAddresses = bind.Split(',')
};
@@ -458,7 +336,7 @@ namespace Jellyfin.Networking.Tests
NetworkManager.MockNetworkSettings = interfaces;
using var nm = new NetworkManager(GetMockConfig(conf), new NullLogger<NetworkManager>());
- var interfaceToUse = nm.GetBindInterface(string.Empty, out _);
+ var interfaceToUse = nm.GetBindAddress(string.Empty, out _);
Assert.Equal(result, interfaceToUse);
}
@@ -474,7 +352,7 @@ namespace Jellyfin.Networking.Tests
{
var conf = new NetworkConfiguration
{
- EnableIPV4 = true,
+ EnableIPv4 = true,
LocalNetworkSubnets = lan.Split(','),
LocalNetworkAddresses = bind.Split(',')
};
@@ -482,7 +360,7 @@ namespace Jellyfin.Networking.Tests
NetworkManager.MockNetworkSettings = interfaces;
using var nm = new NetworkManager(GetMockConfig(conf), new NullLogger<NetworkManager>());
- var interfaceToUse = nm.GetBindInterface(source, out _);
+ var interfaceToUse = nm.GetBindAddress(source, out _);
Assert.Equal(result, interfaceToUse);
}
diff --git a/tests/Jellyfin.Server.Tests/ParseNetworkTests.cs b/tests/Jellyfin.Server.Tests/ParseNetworkTests.cs
index a1bdfa31b..49516cccc 100644
--- a/tests/Jellyfin.Server.Tests/ParseNetworkTests.cs
+++ b/tests/Jellyfin.Server.Tests/ParseNetworkTests.cs
@@ -21,9 +21,9 @@ namespace Jellyfin.Server.Tests
data.Add(
true,
true,
- new string[] { "192.168.t", "127.0.0.1", "1234.1232.12.1234" },
- new IPAddress[] { IPAddress.Loopback.MapToIPv6() },
- Array.Empty<IPNetwork>());
+ 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) });
data.Add(
true,
@@ -64,7 +64,7 @@ namespace Jellyfin.Server.Tests
true,
true,
new string[] { "localhost" },
- new IPAddress[] { IPAddress.Loopback.MapToIPv6() },
+ new IPAddress[] { IPAddress.Loopback },
new IPNetwork[] { new IPNetwork(IPAddress.IPv6Loopback, 128) });
return data;
}
@@ -77,8 +77,8 @@ namespace Jellyfin.Server.Tests
var settings = new NetworkConfiguration
{
- EnableIPV4 = ip4,
- EnableIPV6 = ip6
+ EnableIPv4 = ip4,
+ EnableIPv6 = ip6
};
ForwardedHeadersOptions options = new ForwardedHeadersOptions();
@@ -116,8 +116,8 @@ namespace Jellyfin.Server.Tests
{
var conf = new NetworkConfiguration()
{
- EnableIPV6 = true,
- EnableIPV4 = true,
+ EnableIPv6 = true,
+ EnableIPv4 = true,
};
return new NetworkManager(GetMockConfig(conf), new NullLogger<NetworkManager>());
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-06 20:31:38 +0000