Skip to content

Commit

Permalink
修复reality
Browse files Browse the repository at this point in the history
  • Loading branch information
@yanue
yanue committed Jul 12, 2023
1 parent 73be77c commit 5d6205c
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 55 deletions.
Binary file added Build/v2ray-core/.DS_Store
View file
Binary file not shown.
Binary file added Build/v2ray-core/v2ray
View file
Binary file not shown.
Binary file added Build/v2ray-core/v2ray-arm64
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions V2rayU.xcodeproj/project.pbxproj
View file
Expand Up @@ -951,7 +951,7 @@
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 3.5.0;
CURRENT_PROJECT_VERSION = 3.6.0;
DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = "";
Expand All @@ -964,7 +964,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
MARKETING_VERSION = 3.5.0;
MARKETING_VERSION = 3.6.0;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = net.yanue.V2rayU;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -989,7 +989,7 @@
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 3.5.0;
CURRENT_PROJECT_VERSION = 3.6.0;
DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = "";
Expand All @@ -1002,7 +1002,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
MARKETING_VERSION = 3.5.0;
MARKETING_VERSION = 3.6.0;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = net.yanue.V2rayU;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
2 changes: 1 addition & 1 deletion V2rayU/ConfigWindow.swift
View file
Expand Up @@ -463,10 +463,10 @@ class ConfigWindowController: NSWindowController, NSWindowDelegate, NSTabViewDel
self.streamTlsAllowInsecure.intValue = v2rayConfig.securityTls.allowInsecure ? 1 : 0
self.streamTlsServerName.stringValue = v2rayConfig.securityTls.serverName

print("v2rayConfig.securityReality",v2rayConfig.securityReality)
// reality
self.streamRealityServerName.stringValue = v2rayConfig.securityReality.serverName
self.streamRealityPublicKey.stringValue = v2rayConfig.securityReality.publicKey
self.streamRealityPublicKey.stringValue = v2rayConfig.securityReality.publicKey
self.streamRealityShortId.stringValue = v2rayConfig.securityReality.shortId
self.streamRealitySpiderX.stringValue = v2rayConfig.securityReality.spiderX

Expand Down
73 changes: 23 additions & 50 deletions V2rayU/v2ray/V2rayConfig.swift
View file
Expand Up @@ -602,15 +602,13 @@ class V2rayConfig: NSObject {
}

if self.streamSecurity == "tls" {
var tls = self.securityTls
streamSettings.security = .tls
streamSettings.tlsSettings = tls
streamSettings.tlsSettings = self.securityTls
}

if self.streamSecurity == "xtls" {
var tls = self.securityTls
streamSettings.security = .xtls
streamSettings.xtlsSettings = tls
streamSettings.xtlsSettings = self.securityTls
}

if self.streamSecurity == "reality" {
Expand Down Expand Up @@ -1132,11 +1130,6 @@ class V2rayConfig: NSObject {
settingVLess.vnext = vnext
v2rayOutbound.settingVLess = settingVLess

var mux = V2rayOutboundMux()
mux.enabled = self.enableMux
mux.concurrency = self.mux
v2rayOutbound.mux = mux

break

case .trojan:
Expand Down Expand Up @@ -1245,20 +1238,24 @@ class V2rayConfig: NSObject {
if preTxt == "outbound" {

if transport.xtlsSettings != nil {
if transport.xtlsSettings?.serverName != nil {
self.securityTls.serverName = transport.xtlsSettings!.serverName
self.securityTls.allowInsecure = transport.xtlsSettings!.allowInsecure
}
self.securityTls.serverName = transport.xtlsSettings!.serverName
self.securityTls.allowInsecure = transport.xtlsSettings!.allowInsecure
}

if transport.tlsSettings != nil {
// set data
if transport.tlsSettings?.serverName != nil {
self.securityTls.serverName = transport.tlsSettings!.serverName
self.securityTls.allowInsecure = transport.tlsSettings!.allowInsecure
}
self.securityTls.serverName = transport.tlsSettings!.serverName
self.securityTls.allowInsecure = transport.tlsSettings!.allowInsecure
}


if transport.realitySettings != nil {
self.securityReality.serverName = transport.realitySettings!.serverName
self.securityReality.show = transport.realitySettings!.show
self.securityReality.fingerprint = transport.realitySettings!.fingerprint
self.securityReality.publicKey = transport.realitySettings!.publicKey
self.securityReality.shortId = transport.realitySettings!.shortId
self.securityReality.spiderX = transport.realitySettings!.spiderX
}

if transport.tcpSettings != nil {
self.streamTcp = transport.tcpSettings!
}
Expand Down Expand Up @@ -1291,7 +1288,7 @@ class V2rayConfig: NSObject {
var stream = V2rayTransport()
// tlsSettings
if streamJson["tlsSettings"].dictionaryValue.count > 0 {
var settings = streamJson["tlsSettings"]
let settings = streamJson["tlsSettings"]
var tlsSettings = TlsSettings()
tlsSettings.serverName = settings["serverName"].stringValue
tlsSettings.alpn = settings["alpn"].stringValue
Expand All @@ -1315,31 +1312,7 @@ class V2rayConfig: NSObject {

// xtlsSettings
if streamJson["xtlsSettings"].dictionaryValue.count > 0 {
var settings = streamJson["xtlsSettings"]
var tlsSettings = TlsSettings()
tlsSettings.serverName = settings["serverName"].stringValue
tlsSettings.alpn = settings["alpn"].stringValue
tlsSettings.allowInsecure = settings["allowInsecure"].boolValue
tlsSettings.allowInsecureCiphers = settings["allowInsecureCiphers"].boolValue
// certificates
if settings["certificates"].dictionaryValue.count > 0 {
var certificates = TlsCertificates()
let usage = TlsCertificates.usage(rawValue: settings["certificates"]["usage"].stringValue)
if (usage != nil) {
certificates.usage = usage!
}
certificates.certificateFile = settings["certificates"]["certificateFile"].stringValue
certificates.keyFile = settings["certificates"]["keyFile"].stringValue
certificates.certificate = settings["certificates"]["certificate"].stringValue
certificates.key = settings["certificates"]["key"].stringValue
tlsSettings.certificates = certificates
}
stream.xtlsSettings = tlsSettings
}

// utlsSettings
if streamJson["utlsSettings"].dictionaryValue.count > 0 {
var settings = streamJson["utlsSettings"]
let settings = streamJson["xtlsSettings"]
var tlsSettings = TlsSettings()
tlsSettings.serverName = settings["serverName"].stringValue
tlsSettings.alpn = settings["alpn"].stringValue
Expand All @@ -1360,15 +1333,15 @@ class V2rayConfig: NSObject {
}
stream.xtlsSettings = tlsSettings
}

// reality
if streamJson["realitySettings"].dictionaryValue.count > 0 {
var settings = streamJson["realitySettings"]
let settings = streamJson["realitySettings"]
var realitySettings = RealitySettings()
realitySettings.show = settings["show"].boolValue
realitySettings.fingerprint = settings["fingerprint"].stringValue // 必填，使用 uTLS 库模拟客户端 TLS 指纹
realitySettings.serverName = settings["allowInsecure"].stringValue
realitySettings.publicKey = settings["allowInsecureCiphers"].stringValue
realitySettings.serverName = settings["serverName"].stringValue
realitySettings.publicKey = settings["publicKey"].stringValue
realitySettings.shortId = settings["shortId"].stringValue
realitySettings.spiderX = settings["spiderX"].stringValue

Expand All @@ -1393,7 +1366,7 @@ class V2rayConfig: NSObject {

// request
if streamJson["tcpSettings"]["header"]["request"].dictionaryValue.count > 0 {
var requestJson = streamJson["tcpSettings"]["header"]["request"]
let requestJson = streamJson["tcpSettings"]["header"]["request"]
var tcpRequest = TcpSettingHeaderRequest()
tcpRequest.version = requestJson["version"].stringValue
tcpRequest.method = requestJson["method"].stringValue
Expand Down

0 comments on commit 5d6205c

Please sign in to comment.