mirror of
https://github.com/2dust/v2rayN.git
synced 2026-11-16 17:35:01 +03:00
Compare commits
3 Commits
a2a5940d91
...
da65faa49f
| Author | SHA1 | Date | |
|---|---|---|---|
| da65faa49f | |||
| b6cfce069a | |||
| 39ec9239d2 |
@@ -26,7 +26,6 @@ jobs:
|
||||
)
|
||||
}}
|
||||
env:
|
||||
NUGET_CERT_REVOCATION_MODE: offline
|
||||
Output: "${{ github.workspace }}/${{ matrix.arch }}"
|
||||
RID: |-
|
||||
${{
|
||||
@@ -69,4 +68,4 @@ jobs:
|
||||
uses: actions/upload-artifact@v7.0.1
|
||||
with:
|
||||
name: ${{ matrix.arch }}
|
||||
path: ${{ matrix.arch }}
|
||||
path: ${{ matrix.arch }}
|
||||
@@ -1,8 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
export NUGET_CERT_REVOCATION_MODE="${NUGET_CERT_REVOCATION_MODE:-offline}"
|
||||
|
||||
VERSION_ARG=""
|
||||
WITH_CORE="both"
|
||||
FORCE_NETCORE=0
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
export NUGET_CERT_REVOCATION_MODE="${NUGET_CERT_REVOCATION_MODE:-offline}"
|
||||
|
||||
VERSION_ARG=""
|
||||
WITH_CORE="both"
|
||||
FORCE_NETCORE=0
|
||||
|
||||
+1
-3
@@ -1,8 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
export NUGET_CERT_REVOCATION_MODE="${NUGET_CERT_REVOCATION_MODE:-offline}"
|
||||
|
||||
VERSION_ARG=""
|
||||
WITH_CORE="both"
|
||||
FORCE_NETCORE=0
|
||||
@@ -755,4 +753,4 @@ main() {
|
||||
print_summary
|
||||
}
|
||||
|
||||
main "$@"
|
||||
main "$@"
|
||||
@@ -1,8 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
export NUGET_CERT_REVOCATION_MODE="${NUGET_CERT_REVOCATION_MODE:-offline}"
|
||||
|
||||
VERSION_ARG=""
|
||||
WITH_CORE="both"
|
||||
FORCE_NETCORE=0
|
||||
|
||||
+1
-3
@@ -1,8 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
export NUGET_CERT_REVOCATION_MODE="${NUGET_CERT_REVOCATION_MODE:-offline}"
|
||||
|
||||
VERSION_ARG=""
|
||||
WITH_CORE="both"
|
||||
FORCE_NETCORE=0
|
||||
@@ -700,4 +698,4 @@ main() {
|
||||
print_summary
|
||||
}
|
||||
|
||||
main "$@"
|
||||
main "$@"
|
||||
@@ -11,16 +11,17 @@
|
||||
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.17" />
|
||||
<PackageVersion Include="AwesomeAssertions" Version="9.4.0" />
|
||||
<PackageVersion Include="DialogHost.Avalonia" Version="0.11.0" />
|
||||
<PackageVersion Include="ReactiveUI.Avalonia" Version="11.4.12" />
|
||||
<PackageVersion Include="IPNetwork2" Version="4.3.0" />
|
||||
<PackageVersion Include="ReactiveUI.Avalonia" Version="11.4.13" />
|
||||
<PackageVersion Include="CliWrap" Version="3.10.1" />
|
||||
<PackageVersion Include="Downloader" Version="5.7.0" />
|
||||
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
|
||||
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.4.1" />
|
||||
<PackageVersion Include="MaterialDesignThemes" Version="5.3.2" />
|
||||
<PackageVersion Include="QRCoder" Version="1.8.0" />
|
||||
<PackageVersion Include="ReactiveUI" Version="23.2.27" />
|
||||
<PackageVersion Include="ReactiveUI" Version="23.2.28" />
|
||||
<PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
|
||||
<PackageVersion Include="ReactiveUI.WPF" Version="23.2.27" />
|
||||
<PackageVersion Include="ReactiveUI.WPF" Version="23.2.28" />
|
||||
<PackageVersion Include="Semi.Avalonia" Version="11.3.14" />
|
||||
<PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.2" />
|
||||
<PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7.3" />
|
||||
@@ -28,7 +29,6 @@
|
||||
<PackageVersion Include="sqlite-net-e" Version="1.11.0" />
|
||||
<PackageVersion Include="Repobot.SQLite.Unofficial" Version="3.53.2" />
|
||||
<PackageVersion Include="TaskScheduler" Version="2.12.2" />
|
||||
<PackageVersion Include="Tmds.DBus.Protocol" Version="0.94.1" />
|
||||
<PackageVersion Include="WebDav.Client" Version="2.9.0" />
|
||||
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
|
||||
<PackageVersion Include="xunit.v3" Version="3.2.2" />
|
||||
|
||||
@@ -187,7 +187,7 @@ internal static class CoreConfigTestFactory
|
||||
SimpleDnsItem = config.SimpleDNSItem,
|
||||
AllProxiesMap = new Dictionary<string, ProfileItem> { [node.IndexId] = node },
|
||||
FullConfigTemplate = null,
|
||||
IsTunEnabled = false,
|
||||
IsTunEnabled = config.TunModeItem.EnableTun,
|
||||
ProtectDomainList = [],
|
||||
};
|
||||
}
|
||||
@@ -206,4 +206,12 @@ internal static class CoreConfigTestFactory
|
||||
config.SimpleDNSItem.BootstrapDNS = bootstrapDns;
|
||||
return config;
|
||||
}
|
||||
|
||||
public static Config CreateConfigWithTunRouteExcludeAddress(ECoreType coreType)
|
||||
{
|
||||
var config = CreateConfig(coreType);
|
||||
config.TunModeItem.EnableTun = true;
|
||||
config.TunModeItem.RouteExcludeAddress = ["10.0.0.1/32", "192.168.1.0/24", "fc00::/7"];
|
||||
return config;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -536,4 +536,27 @@ public class CoreConfigV2rayServiceTests
|
||||
directOutbound.Should().NotBeNull();
|
||||
directOutbound!.settings.domainStrategy.Should().Be("UseIPv4");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void GenerateClientConfigContent_TunRouteExcludeAddress()
|
||||
{
|
||||
var config = CoreConfigTestFactory.CreateConfigWithTunRouteExcludeAddress(ECoreType.Xray);
|
||||
CoreConfigTestFactory.BindAppManagerConfig(config);
|
||||
|
||||
var node = CoreConfigTestFactory.CreateVmessNode(ECoreType.Xray, "n-main", "main");
|
||||
var context = CoreConfigTestFactory.CreateContext(config, node, ECoreType.Xray);
|
||||
|
||||
var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
|
||||
|
||||
result.Success.Should().BeTrue();
|
||||
|
||||
var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
|
||||
var tunInbound = cfg.inbounds.FirstOrDefault(i => i.protocol == "tun");
|
||||
|
||||
tunInbound.Should().NotBeNull();
|
||||
|
||||
tunInbound!.settings.autoSystemRoutingTable.Should().NotContain("0.0.0.0/0");
|
||||
tunInbound!.settings.autoSystemRoutingTable.Should().Contain("10.0.0.0/32");
|
||||
tunInbound!.settings.autoSystemRoutingTable.Should().Contain("10.0.0.2/31");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -91,6 +91,20 @@ public class CoreConfigContextBuilder
|
||||
context.AllProxiesMap[$"remark:{ruleItem.OutboundTag}"] = actRuleNode;
|
||||
}
|
||||
}
|
||||
if (context.IsTunEnabled && context.AppConfig.TunModeItem.RouteExcludeAddress is { Count: > 0 })
|
||||
{
|
||||
foreach (var addr in context.AppConfig.TunModeItem.RouteExcludeAddress)
|
||||
{
|
||||
try
|
||||
{
|
||||
IPNetwork2.Parse(addr);
|
||||
}
|
||||
catch
|
||||
{
|
||||
validatorResult.Errors.Add(string.Format(ResUI.MsgTunRouteExcludeInvalidAddress, addr));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return new CoreConfigContextBuilderResult(context, validatorResult);
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ public class Inboundsettings4Ray
|
||||
|
||||
public string? autoOutboundsInterface { get; set; }
|
||||
|
||||
// public List<string>? dns { get; set; }
|
||||
public List<string>? dns { get; set; }
|
||||
}
|
||||
|
||||
public class UsersItem4Ray
|
||||
|
||||
Generated
+9
@@ -2229,6 +2229,15 @@ namespace ServiceLib.Resx {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查找类似 Invalid address in TUN route exclude list: {0} 的本地化字符串。
|
||||
/// </summary>
|
||||
public static string MsgTunRouteExcludeInvalidAddress {
|
||||
get {
|
||||
return ResourceManager.GetString("MsgTunRouteExcludeInvalidAddress", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查找类似 Unpacking... 的本地化字符串。
|
||||
/// </summary>
|
||||
|
||||
@@ -1758,4 +1758,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
|
||||
<data name="TbRouteExcludeAddressTip" xml:space="preserve">
|
||||
<value>Use commas (,) to separate.</value>
|
||||
</data>
|
||||
<data name="MsgTunRouteExcludeInvalidAddress" xml:space="preserve">
|
||||
<value>Invalid address in TUN route exclude list: {0}</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -1755,4 +1755,7 @@
|
||||
<data name="TbRouteExcludeAddressTip" xml:space="preserve">
|
||||
<value>使用逗号 (,) 分隔</value>
|
||||
</data>
|
||||
<data name="MsgTunRouteExcludeInvalidAddress" xml:space="preserve">
|
||||
<value>TUN 路由排除列表包含无效地址:{0}</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -8,6 +8,9 @@
|
||||
"172.18.0.1/30",
|
||||
"fdfe:dcba:9876::1/126"
|
||||
],
|
||||
"dns": [
|
||||
"172.18.0.1"
|
||||
],
|
||||
"autoSystemRoutingTable": [
|
||||
"0.0.0.0/0",
|
||||
"::/0"
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Downloader" />
|
||||
<PackageReference Include="IPNetwork2" />
|
||||
<PackageReference Include="ReactiveUI">
|
||||
<TreatAsUsed>true</TreatAsUsed>
|
||||
</PackageReference>
|
||||
|
||||
@@ -30,14 +30,19 @@ public partial class CoreConfigV2rayService
|
||||
inbound3.listen = listen;
|
||||
_coreConfig.inbounds.Add(inbound3);
|
||||
|
||||
//auth
|
||||
// auth
|
||||
if (_config.Inbound.First().User.IsNotEmpty() && _config.Inbound.First().Pass.IsNotEmpty())
|
||||
{
|
||||
inbound3.settings.auth = "password";
|
||||
inbound3.settings.accounts = new List<AccountsItem4Ray>
|
||||
{
|
||||
new() { user = _config.Inbound.First().User, pass = _config.Inbound.First().Pass }
|
||||
};
|
||||
inbound3.settings.accounts =
|
||||
[
|
||||
new()
|
||||
{
|
||||
user = _config.Inbound.First().User,
|
||||
pass = _config.Inbound.First().Pass,
|
||||
},
|
||||
|
||||
];
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -53,12 +58,15 @@ public partial class CoreConfigV2rayService
|
||||
{
|
||||
_config.TunModeItem.Mtu = Global.TunMtus.First();
|
||||
}
|
||||
var tunInbound = JsonUtils.Deserialize<Inbounds4Ray>(EmbedUtils.GetEmbedText(Global.V2raySampleTunInbound)) ?? new Inbounds4Ray { };
|
||||
var tunInbound =
|
||||
JsonUtils.Deserialize<Inbounds4Ray>(EmbedUtils.GetEmbedText(Global.V2raySampleTunInbound)) ??
|
||||
new Inbounds4Ray();
|
||||
tunInbound.settings.name = context.IsMacOS ? $"utun{new Random().Next(99)}" : "xray_tun";
|
||||
tunInbound.settings.MTU = _config.TunModeItem.Mtu;
|
||||
if (_config.TunModeItem.EnableIPv6Address == false)
|
||||
if (!_config.TunModeItem.EnableIPv6Address)
|
||||
{
|
||||
tunInbound.settings.gateway = ["172.18.0.1/30"];
|
||||
tunInbound.settings.autoSystemRoutingTable = ["0.0.0.0/0"];
|
||||
}
|
||||
var bindInterface = _config.CoreBasicItem.BindInterface?.TrimEx();
|
||||
if (!bindInterface.IsNullOrEmpty())
|
||||
@@ -66,6 +74,53 @@ public partial class CoreConfigV2rayService
|
||||
tunInbound.settings.autoOutboundsInterface = bindInterface;
|
||||
}
|
||||
tunInbound.sniffing = inbound.sniffing;
|
||||
|
||||
if (_config.TunModeItem.RouteExcludeAddress is { Count: > 0 })
|
||||
{
|
||||
var wholeInternet = IPNetwork2.Parse("0.0.0.0/0");
|
||||
var wholeInternetV6 = IPNetwork2.Parse("::/0");
|
||||
|
||||
var excludeList = _config.TunModeItem.RouteExcludeAddress.Select(IPNetwork2.Parse)
|
||||
.Where(x => x != null).ToList();
|
||||
|
||||
var includeList = new List<IPNetwork2> { wholeInternet };
|
||||
var includeListV6 = new List<IPNetwork2> { wholeInternetV6 };
|
||||
|
||||
foreach (var exclude in excludeList)
|
||||
{
|
||||
var temp = new List<IPNetwork2>();
|
||||
if (exclude.AddressFamily == AddressFamily.InterNetwork)
|
||||
{
|
||||
foreach (var net in includeList)
|
||||
{
|
||||
temp.AddRange(net.Subtract(exclude));
|
||||
}
|
||||
includeList = temp;
|
||||
}
|
||||
else if (exclude.AddressFamily == AddressFamily.InterNetworkV6)
|
||||
{
|
||||
foreach (var net in includeListV6)
|
||||
{
|
||||
temp.AddRange(net.Subtract(exclude));
|
||||
}
|
||||
includeListV6 = temp;
|
||||
}
|
||||
}
|
||||
|
||||
includeList = IPNetwork2.Supernet(includeList.ToArray()).ToList();
|
||||
includeListV6 = IPNetwork2.Supernet(includeListV6.ToArray()).ToList();
|
||||
|
||||
if (_config.TunModeItem.EnableIPv6Address)
|
||||
{
|
||||
tunInbound.settings.autoSystemRoutingTable = includeList.Select(x => x.ToString())
|
||||
.Concat(includeListV6.Select(x => x.ToString())).ToList();
|
||||
}
|
||||
else
|
||||
{
|
||||
tunInbound.settings.autoSystemRoutingTable = includeList.Select(x => x.ToString()).ToList();
|
||||
}
|
||||
}
|
||||
|
||||
_coreConfig.inbounds.Add(tunInbound);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user