pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-11-02 18:45:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore(deps): bump IPNetwork2 from 4.3.0 to 5.0.1 (#10453)

Browse Source 
* chore(deps): bump IPNetwork2 from 4.3.0 to 5.0.1

* test: use AOT-safe IPNetwork route assertions
This commit is contained in:
Miheichev Aleksandr Sergeevich
2026-11-02 01:24:35 +00:00
committed by GitHub
parent 8c02b5f2f6
commit 7a52be4150
2 changed files with 129 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/Directory.Packages.props
+1 -1
View File
@@ -9,7 +9,7 @@
<PackageVersion Include="Avalonia.Desktop" Version="12.1.4" />
<PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3" />
<PackageVersion Include="DialogHost.Avalonia" Version="0.12.3" />
<PackageVersion Include="IPNetwork2" Version="4.3.0" />
<PackageVersion Include="IPNetwork2" Version="5.0.1" />
<PackageVersion Include="ProDataGrid" Version="12.1.0.6" />
<PackageVersion Include="ReactiveUI.Avalonia" Version="12.1.6" />
<PackageVersion Include="CliWrap" Version="3.10.5" />
v2rayN/ServiceLib.Tests/CoreConfig/V2ray/CoreConfigV2rayIPNetworkTests.cs
+128
View File
@@ -0,0 +1,128 @@
namespace ServiceLib.Tests.CoreConfig.V2ray;
public class CoreConfigV2rayIPNetworkTests
{
[Test]
[Arguments("0.0.0.0/0", "::/0")]
[Arguments("::/0", "0.0.0.0/0")]
[Arguments("0.0.0.0/1", "128.0.0.0/1,::/0")]
[Arguments("::/1", "0.0.0.0/0,8000::/1")]
public async Task GenerateClientConfigContent_TunExclusion_ShouldPreserveRemainingRoutes(
string excludedNetwork, string expectedRoutes)
{
var config = CoreConfigTestFactory.CreateConfigWithTun(ECoreType.Xray, true);
config.TunModeItem.RouteExcludeAddress = [excludedNetwork];
var generated = await GenerateConfig(config);
var routes = generated.inbounds.Single(i => i.protocol == "tun").settings.autoSystemRoutingTable;
await routes.Should().BeEquivalentTo(expectedRoutes.Split(','), StringComparer.Ordinal);
}
[Test]
public async Task GenerateClientConfigContent_TunExclusions_ShouldHandleOverlappingAndDuplicateNetworks()
{
var config = CoreConfigTestFactory.CreateConfigWithTun(ECoreType.Xray, true);
config.TunModeItem.RouteExcludeAddress =
[
"0.0.0.0/1", "128.0.0.1/2", "128.0.0.1/2", "128.0.0.1/32",
"::/1", "8000::1/2", "8000::1/128"
];
var generated = await GenerateConfig(config);
var routes = generated.inbounds.Single(i => i.protocol == "tun").settings.autoSystemRoutingTable;
await routes.Should().BeEquivalentTo(new[] { "192.0.0.0/2", "c000::/2" }, StringComparer.Ordinal);
}
[Test]
public async Task GenerateClientConfigContent_TunExclusions_ShouldAllowExcludingBothAddressFamilies()
{
var config = CoreConfigTestFactory.CreateConfigWithTun(ECoreType.Xray, true);
config.TunModeItem.RouteExcludeAddress = ["0.0.0.0/0", "::/0"];
var generated = await GenerateConfig(config);
var routes = generated.inbounds.Single(i => i.protocol == "tun").settings.autoSystemRoutingTable;
await routes.Should().BeEmpty();
}
[Test]
public async Task GenerateClientConfigContent_TunHostExclusions_ShouldPreserveNeighbouringAddresses()
{
var config = CoreConfigTestFactory.CreateConfigWithTun(ECoreType.Xray, true);
config.TunModeItem.RouteExcludeAddress =
[
"0.0.0.0/32", "255.255.255.255/32",
"::/128", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128"
];
var generated = await GenerateConfig(config);
var routes = generated.inbounds.Single(i => i.protocol == "tun").settings.autoSystemRoutingTable
.Select(IPNetwork.Parse).ToArray();
foreach (var address in new[]
{
"0.0.0.0", "255.255.255.255", "::", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"
})
{
await routes.Any(route => route.Contains(IPAddress.Parse(address))).Should().BeFalse();
}
foreach (var address in new[]
{
"0.0.0.1", "255.255.255.254", "::1", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:fffe"
})
{
await routes.Any(route => route.Contains(IPAddress.Parse(address))).Should().BeTrue();
}
}
[Test]
[Arguments("198.18.0.0/15", 131071L)]
[Arguments("0.0.0.0/0", 4294967295L)]
[Arguments("198.18.0.0/31", 1L)]
[Arguments("198.18.0.1/32", 65535L)]
[Arguments("fd00::/64", long.MaxValue)]
[Arguments("fd00::/66", 4611686018427387903L)]
[Arguments("fd00::/127", 1L)]
[Arguments("fd00::1/128", 65535L)]
[Arguments("invalid-network", 65535L)]
[Arguments("198.18.0.0/33", 65535L)]
[Arguments("fd00::/129", 65535L)]
public async Task GenerateClientConfigContent_FakeDns_ShouldDerivePoolSizeOrUseFallback(
string range, long expectedPoolSize)
{
var config = CoreConfigTestFactory.CreateConfig(ECoreType.Xray);
config.SimpleDNSItem.FakeIP = true;
config.SimpleDNSItem.FakeIPRange = range;
CoreConfigTestFactory.BindAppManagerConfig(config);
var node = CoreConfigTestFactory.CreateVmessNode(ECoreType.Xray);
var context = CoreConfigTestFactory.CreateContext(config, node, ECoreType.Xray);
context.RoutingItem!.RuleSet = JsonUtils.Serialize(new List<RulesItem>
{
new()
{
Enabled = true,
RuleType = ERuleType.DNS,
OutboundTag = Global.ProxyTag,
Domain = ["full:example.com"],
}
});
var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
await result.Success.Should().BeTrue();
var generated = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
await generated.fakedns.Should().NotBeNull();
await generated.fakedns!.ipPool.Should().BeEqualTo(range);
await generated.fakedns.poolSize.Should().BeEqualTo(expectedPoolSize);
}
private static async Task<V2rayConfig> GenerateConfig(Config config)
{
CoreConfigTestFactory.BindAppManagerConfig(config);
var node = CoreConfigTestFactory.CreateVmessNode(ECoreType.Xray);
var context = CoreConfigTestFactory.CreateContext(config, node, ECoreType.Xray);
var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
await result.Success.Should().BeTrue();
var generated = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString());
await generated.Should().NotBeNull();
return generated!;
}
}