- Notifications
You must be signed in to change notification settings - Fork3
feat: install and activate the tunnel provider as network extension#20
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
6 changes: 6 additions & 0 deletionsCoder Desktop/Coder Desktop.xcodeproj/project.pbxproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletionsCoder Desktop/Coder Desktop/Coder_Desktop.entitlements
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
113 changes: 113 additions & 0 deletionsCoder Desktop/Coder Desktop/NetworkExtension.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| import NetworkExtension | ||
| import os | ||
| enum NetworkExtensionState: Equatable { | ||
| case unconfigured | ||
| case disbled | ||
| case enabled | ||
| case failed(String) | ||
| var description: String { | ||
| switch self { | ||
| case .unconfigured: | ||
| return "Not logged in to Coder" | ||
| case .enabled: | ||
| return "NetworkExtension tunnel enabled" | ||
| case .disbled: | ||
| return "NetworkExtension tunnel disabled" | ||
| case let .failed(error): | ||
| return "NetworkExtension config failed: \(error)" | ||
| } | ||
| } | ||
| } | ||
| /// An actor that handles configuring, enabling, and disabling the VPN tunnel via the | ||
| /// NetworkExtension APIs. | ||
| extension CoderVPNService { | ||
| func configureNetworkExtension(proto: NETunnelProviderProtocol) async { | ||
| // removing the old tunnels, rather than reconfiguring ensures that configuration changes | ||
| // are picked up. | ||
| do { | ||
| try await removeNetworkExtension() | ||
| } catch { | ||
| logger.error("remove tunnel failed: \(error)") | ||
| neState = .failed(error.localizedDescription) | ||
| return | ||
| } | ||
| logger.debug("inserting new tunnel") | ||
| let tm = NETunnelProviderManager() | ||
| tm.localizedDescription = "CoderVPN" | ||
| tm.protocolConfiguration = proto | ||
| logger.debug("saving new tunnel") | ||
| do { | ||
| try await tm.saveToPreferences() | ||
| } catch { | ||
| logger.error("save tunnel failed: \(error)") | ||
| neState = .failed(error.localizedDescription) | ||
| } | ||
| } | ||
| func removeNetworkExtension() async throws(VPNServiceError) { | ||
| do { | ||
| let tunnels = try await NETunnelProviderManager.loadAllFromPreferences() | ||
| for tunnel in tunnels { | ||
| try await tunnel.removeFromPreferences() | ||
| } | ||
| } catch { | ||
| throw .internalError("couldn't remove tunnels: \(error)") | ||
| } | ||
| } | ||
| func enableNetworkExtension() async { | ||
| do { | ||
| let tm = try await getTunnelManager() | ||
| if !tm.isEnabled { | ||
| tm.isEnabled = true | ||
| try await tm.saveToPreferences() | ||
| logger.debug("saved tunnel with enabled=true") | ||
| } | ||
| try tm.connection.startVPNTunnel() | ||
| } catch { | ||
| logger.error("enable network extension: \(error)") | ||
| neState = .failed(error.localizedDescription) | ||
| return | ||
| } | ||
| logger.debug("enabled and started tunnel") | ||
| neState = .enabled | ||
| } | ||
| func disableNetworkExtension() async { | ||
| do { | ||
| let tm = try await getTunnelManager() | ||
| tm.connection.stopVPNTunnel() | ||
| tm.isEnabled = false | ||
| try await tm.saveToPreferences() | ||
| } catch { | ||
| logger.error("disable network extension: \(error)") | ||
| neState = .failed(error.localizedDescription) | ||
| return | ||
| } | ||
| logger.debug("saved tunnel with enabled=false") | ||
| neState = .disbled | ||
| } | ||
| private func getTunnelManager() async throws(VPNServiceError) -> NETunnelProviderManager { | ||
| var tunnels: [NETunnelProviderManager] = [] | ||
| do { | ||
| tunnels = try await NETunnelProviderManager.loadAllFromPreferences() | ||
| } catch { | ||
| throw .internalError("couldn't load tunnels: \(error)") | ||
| } | ||
| if tunnels.isEmpty { | ||
| throw .internalError("no tunnels found") | ||
| } | ||
| return tunnels.first! | ||
| } | ||
| } | ||
| // we're going to mark NETunnelProviderManager as Sendable since there are official APIs that return | ||
| // it async. | ||
| extension NETunnelProviderManager: @unchecked @retroactive Sendable {} |
5 changes: 5 additions & 0 deletionsCoder Desktop/Coder Desktop/Preview Content/PreviewSession.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
11 changes: 8 additions & 3 deletionsCoder Desktop/Coder Desktop/Preview Content/PreviewVPN.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
22 changes: 20 additions & 2 deletionsCoder Desktop/Coder Desktop/Session.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.