passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

macOS: Handle tunnel deletions outside the app

This commit is contained in:
Roopesh Chander 2019-01-22 19:11:51 +05:30
parent d3db8519b0
commit c477f721fb
1 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
WireGuard/WireGuard/Tunnel/TunnelsManager.swift
View File

@ -25,10 +25,12 @@ class TunnelsManager {
weak var activationDelegate: TunnelsManagerActivationDelegate? weak var activationDelegate: TunnelsManagerActivationDelegate?
private var statusObservationToken: AnyObject? private var statusObservationToken: AnyObject?
private var waiteeObservationToken: AnyObject? private var waiteeObservationToken: AnyObject?
private var configurationsObservationToken: AnyObject?
init(tunnelProviders: [NETunnelProviderManager]) { init(tunnelProviders: [NETunnelProviderManager]) {
tunnels = tunnelProviders.map { TunnelContainer(tunnel: $0) }.sorted { $0.name < $1.name } tunnels = tunnelProviders.map { TunnelContainer(tunnel: $0) }.sorted { $0.name < $1.name }
startObservingTunnelStatuses() startObservingTunnelStatuses()
startObservingTunnelConfigurations()
} }
static func create(completionHandler: @escaping (WireGuardResult<TunnelsManager>) -> Void) { static func create(completionHandler: @escaping (WireGuardResult<TunnelsManager>) -> Void) {
@ -53,26 +55,33 @@ class TunnelsManager {
#endif #endif
} }
func reload(completionHandler: @escaping (Bool) -> Void) { func reload() {
#if targetEnvironment(simulator) NETunnelProviderManager.loadAllFromPreferences { [weak self] managers, _ in
completionHandler(false) guard let self = self else { return }
#else
NETunnelProviderManager.loadAllFromPreferences { managers, _ in
guard let managers = managers else {
completionHandler(false)
return
}
let newTunnels = managers.map { TunnelContainer(tunnel: $0) }.sorted { $0.name < $1.name } let loadedTunnelProviders = managers ?? []
let hasChanges = self.tunnels.map { $0.tunnelConfiguration } != newTunnels.map { $0.tunnelConfiguration }
if hasChanges { var numberOfRemovedTunnels = 0
self.tunnels = newTunnels for (index, currentTunnel) in self.tunnels.enumerated() {
completionHandler(true) if !loadedTunnelProviders.contains(where: { $0.tunnelConfiguration == currentTunnel.tunnelConfiguration }) {
} else { // Tunnel was deleted outside the app
completionHandler(false) self.tunnels.remove(at: index - numberOfRemovedTunnels)
self.tunnelsListDelegate?.tunnelRemoved(at: index - numberOfRemovedTunnels)
numberOfRemovedTunnels += 1
}
}
for loadedTunnelProvider in loadedTunnelProviders {
if let matchingTunnel = self.tunnels.first(where: { $0.tunnelConfiguration == loadedTunnelProvider.tunnelConfiguration }) {
matchingTunnel.tunnelProvider = loadedTunnelProvider
} else {
// Tunnel was added outside the app
let tunnel = TunnelContainer(tunnel: loadedTunnelProvider)
self.tunnels.append(tunnel)
self.tunnels.sort { $0.name < $1.name }
self.tunnelsListDelegate?.tunnelAdded(at: self.tunnels.firstIndex(of: tunnel)!)
}
} }
} }
#endif
} }
func add(tunnelConfiguration: TunnelConfiguration, activateOnDemandSetting: ActivateOnDemandSetting = ActivateOnDemandSetting.defaultSetting, completionHandler: @escaping (WireGuardResult<TunnelContainer>) -> Void) { func add(tunnelConfiguration: TunnelConfiguration, activateOnDemandSetting: ActivateOnDemandSetting = ActivateOnDemandSetting.defaultSetting, completionHandler: @escaping (WireGuardResult<TunnelContainer>) -> Void) {
@ -319,6 +328,12 @@ class TunnelsManager {
} }
} }
func startObservingTunnelConfigurations() {
configurationsObservationToken = NotificationCenter.default.addObserver(forName: .NEVPNConfigurationChange, object: nil, queue: OperationQueue.main) { [weak self] _ in
self?.reload()
}
}
} }
private func lastErrorTextFromNetworkExtension(for tunnel: TunnelContainer) -> (title: String, message: String)? { private func lastErrorTextFromNetworkExtension(for tunnel: TunnelContainer) -> (title: String, message: String)? {
@ -367,7 +382,7 @@ class TunnelContainer: NSObject {
fileprivate var tunnelProvider: NETunnelProviderManager fileprivate var tunnelProvider: NETunnelProviderManager
var tunnelConfiguration: TunnelConfiguration? { var tunnelConfiguration: TunnelConfiguration? {
return (tunnelProvider.protocolConfiguration as? NETunnelProviderProtocol)?.asTunnelConfiguration(called: tunnelProvider.localizedDescription) return tunnelProvider.tunnelConfiguration
} }
var activateOnDemandSetting: ActivateOnDemandSetting { var activateOnDemandSetting: ActivateOnDemandSetting {
@ -461,3 +476,9 @@ class TunnelContainer: NSObject {
(tunnelProvider.connection as? NETunnelProviderSession)?.stopTunnel() (tunnelProvider.connection as? NETunnelProviderSession)?.stopTunnel()
} }
} }
extension NETunnelProviderManager {
var tunnelConfiguration: TunnelConfiguration? {
return (protocolConfiguration as? NETunnelProviderProtocol)?.asTunnelConfiguration(called: localizedDescription)
}
}