From 77f929789cea0371c89e4a8d14816caf9690e94a Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Tue, 12 Feb 2019 17:37:14 +0530 Subject: [PATCH] Don't migrate in asTunnelConfiguration() It causes problems when installing a tunnel through a Configuration Profile on macOS and activating it first through Network Preferences. Signed-off-by: Roopesh Chander --- .../NETunnelProviderProtocol+Extension.swift | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/WireGuard/Shared/Model/NETunnelProviderProtocol+Extension.swift b/WireGuard/Shared/Model/NETunnelProviderProtocol+Extension.swift index 7345794..a57d5ff 100644 --- a/WireGuard/Shared/Model/NETunnelProviderProtocol+Extension.swift +++ b/WireGuard/Shared/Model/NETunnelProviderProtocol+Extension.swift @@ -34,17 +34,14 @@ extension NETunnelProviderProtocol { } func asTunnelConfiguration(called name: String? = nil) -> TunnelConfiguration? { - migrateConfigurationIfNeeded(called: name ?? "unknown") - //TODO: in the case where migrateConfigurationIfNeeded is called by the network extension, - // before the app has started, and when there is, in fact, configuration that needs to be - // put into the keychain, this will generate one new keychain item every time it is started, - // until finally the app is open. Would it be possible to call saveToPreferences here? Or is - // that generally not available to network extensions? In which case, what should our - // behavior be? - - guard let passwordReference = passwordReference else { return nil } - guard let config = Keychain.openReference(called: passwordReference) else { return nil } - return try? TunnelConfiguration(fromWgQuickConfig: config, called: name) + if let passwordReference = passwordReference, + let config = Keychain.openReference(called: passwordReference) { + return try? TunnelConfiguration(fromWgQuickConfig: config, called: name) + } + if let oldConfig = providerConfiguration?["WgQuickConfig"] as? String { + return try? TunnelConfiguration(fromWgQuickConfig: oldConfig, called: name) + } + return nil } func destroyConfigurationReference() {