hackclub/burrow
1
0
Fork 0
Code Pull requests Releases Packages Activity Actions

Relax tunnel provider isolation for Xcode 26
Some checks failed
Build Rust / Cargo Test (push) Waiting to run
Details
Build Site / Next.js Build (push) Waiting to run
Details
Build Apple / Build App (iOS Simulator) (push) Failing after 1m14s
Details
Build Apple / Build App (macOS) (push) Failing after 1m54s
Details

Browse source
This commit is contained in:
Conrad Kramer 2026-03-19 03:21:26 -07:00
parent 9a5f147585
commit f7193728df
1 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Apple/NetworkExtension/PacketTunnelProvider.swift
View file

@ -10,14 +10,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
case missingTunnelConfiguration case missingTunnelConfiguration
} }
private let logger = Logger.logger(for: PacketTunnelProvider.self) private static let logger = Logger.logger(for: PacketTunnelProvider.self)
private var client: TunnelClient {
get throws { try _client.get() }
}
private let _client: Result<TunnelClient, Swift.Error> = Result {
try TunnelClient.unix(socketURL: Constants.socketURL)
}
override init() { override init() {
do { do {
@ -26,31 +19,33 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
databasePath: try Constants.databaseURL.path(percentEncoded: false) databasePath: try Constants.databaseURL.path(percentEncoded: false)
) )
} catch { } catch {
logger.error("Failed to spawn networking thread: \(error)") Self.logger.error("Failed to spawn networking thread: \(error)")
} }
} }
override func startTunnel(options: [String: NSObject]? = nil) async throws { nonisolated override func startTunnel(options: [String: NSObject]? = nil) async throws {
do { do {
let client = try TunnelClient.unix(socketURL: Constants.socketURL)
let configuration = try await Array(client.tunnelConfiguration(.init()).prefix(1)).first let configuration = try await Array(client.tunnelConfiguration(.init()).prefix(1)).first
guard let settings = configuration?.settings else { guard let settings = configuration?.settings else {
throw Error.missingTunnelConfiguration throw Error.missingTunnelConfiguration
} }
try await setTunnelNetworkSettings(settings) try await setTunnelNetworkSettings(settings)
_ = try await client.tunnelStart(.init()) _ = try await client.tunnelStart(.init())
logger.log("Started tunnel with network settings: \(settings)") Self.logger.log("Started tunnel with network settings: \(settings)")
} catch { } catch {
logger.error("Failed to start tunnel: \(error)") Self.logger.error("Failed to start tunnel: \(error)")
throw error throw error
} }
} }
override func stopTunnel(with reason: NEProviderStopReason) async { nonisolated override func stopTunnel(with reason: NEProviderStopReason) async {
do { do {
let client = try TunnelClient.unix(socketURL: Constants.socketURL)
_ = try await client.tunnelStop(.init()) _ = try await client.tunnelStop(.init())
logger.log("Stopped client") Self.logger.log("Stopped client")
} catch { } catch {
logger.error("Failed to stop tunnel: \(error)") Self.logger.error("Failed to stop tunnel: \(error)")
} }
} }
} }