Skip to content

fix: connect to xpc on vpn start #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Feb 12, 2025
Merged

fix: connect to xpc on vpn start #40

Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
87ec698
fix: unquarantine dylib after download
ethanndickson Feb 10, 2025
024d7e3
capitalization
ethanndickson Feb 10, 2025
e64ea22
review
ethanndickson Feb 11, 2025
ce1883e
fix: display offline workspaces
ethanndickson Feb 10, 2025
972f269
review
ethanndickson Feb 12, 2025
63442fe
undo dumb idea
ethanndickson Feb 12, 2025
05582ab
chore(ci): build for distribution
ethanndickson Feb 5, 2025
071bf7e
ignore package-lock in git diff
ethanndickson Feb 12, 2025
b5b4b6f
fix: connect to xpc on vpn start
ethanndickson Feb 11, 2025
987d9dd
Merge branch 'main' into ethan/use-fqdn-as-name
ethanndickson Feb 12, 2025
a90267d
rewrite
ethanndickson Feb 12, 2025
0b49daa
fixup
ethanndickson Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 26 additions & 11 deletions Coder Desktop/Coder Desktop/VPNService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@
Task {
await loadNetworkExtensionConfig()
}
xpc.connect()
xpc.getPeerState()
NotificationCenter.default.addObserver(
self,
selector: #selector(vpnDidUpdate(_:)),
Expand All @@ -93,8 +91,6 @@
}

await startTunnel()
xpc.connect()
xpc.ping()
logger.debug("network extension enabled")
}

Expand Down Expand Up @@ -162,28 +158,47 @@
}

extension CoderVPNService {
// The number of NETunnelProviderSession states makes the excessive branching

Check warning on line 161 in Coder Desktop/Coder Desktop/VPNService.swift

View workflow job for this annotation

GitHub Actions / fmt 

Remove trailing space at end of a line. (trailingSpace)
// necessary.
// swiftlint:disable:next cyclomatic_complexity
@objc private func vpnDidUpdate(_ notification: Notification) {
guard let connection = notification.object as? NETunnelProviderSession else {
return
}
switch connection.status {
case .disconnected:
switch (tunnelState, connection.status) {
// Any -> Disconnected: Update UI w/ error if present
case (_, .disconnected):
connection.fetchLastDisconnectError { err in
self.tunnelState = if let err {
.failed(.internalError(err.localizedDescription))
} else {
.disabled
}
}
case .connecting:
// Connecting -> Connecting: no-op
case (.connecting, .connecting):
break
// Connected -> Connected: no-op
case (.connected, .connected):
break
// Non-connecting -> Connecting: Establish XPC
case (_, .connecting):
xpc.connect()
xpc.ping()
tunnelState = .connecting
case .connected:
// Non-connected -> Connected: Retrieve Peers
case (_, .connected):
xpc.connect()
xpc.getPeerState()
tunnelState = .connected
case .reasserting:
// Any -> Reasserting
case (_, .reasserting):
tunnelState = .connecting
case .disconnecting:
// Any -> Disconnecting
case (_, .disconnecting):
tunnelState = .disconnecting
case .invalid:
// Any -> Invalid
case (_, .invalid):
tunnelState = .failed(.networkExtensionError(.unconfigured))
@unknown default:
tunnelState = .disabled
Expand Down
Loading