GitHub/netch
1
0
Fork 0
mirror of https://github.com/netchx/netch.git synced 2026-05-11 23:45:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat: V2Ray TLS AllowInsecure Setting"

Browse Source 
This reverts commit 591f8e5a5c.
This commit is contained in:
ChsBuffer
2020-10-21 22:07:58 +08:00
parent af5100fe73
commit 3d49fe0338
5 changed files with 11 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Netch/Servers/VLESS/VLESSForm/VLESSForm.cs
View File

@@ -1,4 +1,3 @@
using System.Collections.Generic;
using Netch.Forms; using Netch.Forms;
namespace Netch.Servers.VLESS.VLESSForm namespace Netch.Servers.VLESS.VLESSForm
@@ -39,19 +38,9 @@ namespace Netch.Servers.VLESS.VLESSForm
s => true, s => true,
s => server.Path = s, s => server.Path = s,
server.Path); server.Path);
CreateComboBox("TLSSecure", "TLS Secure", CreateCheckBox("TLSSecure", "TLS Secure",
new List<string> {"", "true", "false"}, b => server.TLSSecure = b,
s => server.TLSSecure);
{
server.TLSSecure = s switch
{
"" => null,
"true" => true,
"false" => false,
_ => null
};
},
server.TLSSecure?.ToString() ?? string.Empty);
CreateCheckBox("UseMux", "Use Mux", CreateCheckBox("UseMux", "Use Mux",
b => server.UseMux = b, b => server.UseMux = b,
server.UseMux); server.UseMux);

19
Netch/Servers/VMess/Form/VMessForm.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic; using Netch.Forms;
using Netch.Forms;
namespace Netch.Servers.VMess.Form namespace Netch.Servers.VMess.Form
{ {
@@ -48,22 +47,12 @@ namespace Netch.Servers.VMess.Form
s => true, s => true,
s => server.QUICSecret = s, s => server.QUICSecret = s,
server.QUICSecret); server.QUICSecret);
CreateComboBox("TLSSecure", "TLS Secure",
new List<string> {"", "true", "false"},
s =>
{
server.TLSSecure = s switch
{
"" => null,
"true" => true,
"false" => false,
_ => null
};
},
server.TLSSecure?.ToString() ?? string.Empty);
CreateCheckBox("UseMux", "Use Mux", CreateCheckBox("UseMux", "Use Mux",
s => server.UseMux = s, s => server.UseMux = s,
server.UseMux); server.UseMux);
CreateCheckBox("TLSSecure", "TLS Secure",
s => server.TLSSecure = s,
server.TLSSecure);
} }
} }
} }

4
Netch/Servers/VMess/Utils/V2rayConfigUtils.cs
View File

@@ -238,7 +238,7 @@ namespace Netch.Servers.VMess.Utils
{ {
streamSettings.network = server.TransferProtocol; streamSettings.network = server.TransferProtocol;
var host = server.Host; var host = server.Host;
if (server.TLSSecure ?? Global.Settings.V2RayConfig.AllowInsecure) if (server.TLSSecure)
{ {
streamSettings.security = "tls"; streamSettings.security = "tls";
@@ -318,7 +318,7 @@ namespace Netch.Servers.VMess.Utils
type = server.FakeType type = server.FakeType
} }
}; };
if (server.TLSSecure ?? Global.Settings.V2RayConfig.AllowInsecure) if (server.TLSSecure)
{ {
streamSettings.tlsSettings.serverName = server.Hostname; streamSettings.tlsSettings.serverName = server.Hostname;
} }

2
Netch/Servers/VMess/VMess.cs
View File

@@ -64,7 +64,7 @@ namespace Netch.Servers.VMess
/// <summary> /// <summary>
/// TLS 底层传输安全 /// TLS 底层传输安全
/// </summary> /// </summary>
public bool? TLSSecure { get; set; } public bool TLSSecure { get; set; } = false;
/// <summary> /// <summary>
/// Mux 多路复用 /// Mux 多路复用

2
Netch/Servers/VMess/VMessUtil.cs
View File

@@ -49,7 +49,7 @@ namespace Netch.Servers.VMess
type = server.FakeType, type = server.FakeType,
host = server.Host, host = server.Host,
path = server.Path, path = server.Path,
tls = server.TLSSecure ?? Global.Settings.V2RayConfig.AllowInsecure ? "tls" : "" tls = server.TLSSecure ? "tls" : ""
}); });
return "vmess://" + ShareLink.URLSafeBase64Encode(vmessJson); return "vmess://" + ShareLink.URLSafeBase64Encode(vmessJson);
} }