anlicheng/punchnet-macos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix vpn的配置管理逻辑

Browse Source
This commit is contained in:
anlicheng 2026-05-26 21:07:42 +08:00
parent f252e537db
commit 80d5c7dfb1
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tun/Super/SDLSuperTLSVerifier.swift
View File

@ -12,10 +12,10 @@ enum SDLSuperTLSVerifier {
// 你的 Base64 公钥指纹 // 你的 Base64 公钥指纹
static let pinnedPublicKeyHashes = [ static let pinnedPublicKeyHashes = [
// 正式服务器的 // 正式服务器的
"Q41r6hbMWEVyxo6heNAH4Wx/TH5NNOWlNif9bewcJ3E=", "Q41r6hbMWEVyxo6heNAH4Wx/TH5NNOWlNif9bewcJ3E=".lowercased(),
// 测试服务器 // 测试服务器
"oeU0bWqLWMdn79s4ZHz6IRwXmFX4p70u/Qt9VrsDIb4=" "oeU0bWqLWMdn79s4ZHz6IRwXmFX4p70u/Qt9VrsDIb4=".lowercased()
] ]
static func verify(trust: sec_trust_t, host: String) -> Bool { static func verify(trust: sec_trust_t, host: String) -> Bool {
@ -53,13 +53,13 @@ enum SDLSuperTLSVerifier {
// --- Step 5: SHA256 校验 --- // --- Step 5: SHA256 校验 ---
let hash = SHA256.hash(data: publicKeyData) let hash = SHA256.hash(data: publicKeyData)
let hashBase64 = Data(hash).base64EncodedString() let hashBase64 = Data(hash).base64EncodedString().lowercased()
if pinnedPublicKeyHashes.contains(hashBase64) { if pinnedPublicKeyHashes.contains(hashBase64) {
SDLLogger.log("✅ 公钥校验通过", for: .debug) SDLLogger.log("✅ 公钥校验通过", for: .debug)
return true return true
} else { } else {
SDLLogger.log("⚠️ 公钥不匹配! 收到: \(hashBase64)", for: .debug) SDLLogger.log("⚠️ 公钥不匹配! 收到: \(hashBase64), config hashes: \(pinnedPublicKeyHashes)", for: .debug)
return false return false
} }
} }

12
punchnet/Core/VPNManager.swift
View File

@ -128,13 +128,11 @@ class VPNManager {
let env = SystemConfig.getCurrentEnvConfig() let env = SystemConfig.getCurrentEnvConfig()
for manager in managers { for manager in managers {
// guard let protocolConfiguration = manager.protocolConfiguration as? NETunnelProviderProtocol, guard let protocolConfiguration = manager.protocolConfiguration as? NETunnelProviderProtocol,
// protocolConfiguration.providerBundleIdentifier == env.tunBundleId else { protocolConfiguration.providerBundleIdentifier == env.tunBundleId else {
// try await manager.removeFromPreferences() try await manager.removeFromPreferences()
// continue continue
// } }
// TODO Debug
try await manager.removeFromPreferences()
} }
let managersAfterCleanup = try await NETunnelProviderManager.loadAllFromPreferences() let managersAfterCleanup = try await NETunnelProviderManager.loadAllFromPreferences()