Skip to content
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

Implement VPN control through UDS #2767

Merged
merged 64 commits into from
Jun 12, 2024
Merged

Implement VPN control through UDS #2767

Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
f2ba091
WIP
diegoreymendez Dec 14, 2023
c1c2cc9
Merges the latest from main
diegoreymendez Jan 19, 2024
3fc5b47
Fixes some issues with the last merge
diegoreymendez Jan 19, 2024
ff186b4
WIP
diegoreymendez May 10, 2024
49d54fc
Merges the latest from main, and fixes several conflicts
diegoreymendez May 10, 2024
6ec61cc
UDS connect works, yay
diegoreymendez May 10, 2024
55785b0
UDS works to start and stop the VPN
diegoreymendez May 13, 2024
6a12545
Added some documentation comments
diegoreymendez May 14, 2024
61005c4
Fixes some VPN uninstallation issues
diegoreymendez May 29, 2024
0cfb28e
Merges some of the latest code
diegoreymendez May 29, 2024
5956148
Cleaning up the code, uninstallation works through UDS
diegoreymendez May 29, 2024
1a31735
WIP
diegoreymendez May 31, 2024
dada24f
Refactors AppLauncher to become a generic package that can be used fo…
diegoreymendez May 31, 2024
290fd0e
Removes some unnecessary code
diegoreymendez May 31, 2024
638e154
Code cleanup
diegoreymendez May 31, 2024
0c88755
Fix swiflint
diegoreymendez May 31, 2024
00ed927
Rolls back an unintentional change
diegoreymendez May 31, 2024
7790de4
Rolls back an unintentional change
diegoreymendez May 31, 2024
e77ec42
Rolls back an unintentional change
diegoreymendez May 31, 2024
57f67c6
Removes the UDS helper which should not have been committed here
diegoreymendez May 31, 2024
24f4e8b
Fixes the unit tests
diegoreymendez May 31, 2024
9e4b0f9
Integratest the latest from diego/app-launcher-code-cleanup
diegoreymendez May 31, 2024
60ad00f
Removes a file that was left by a merge issue
diegoreymendez May 31, 2024
508a7bc
Adds VPNAppLauncher
diegoreymendez May 31, 2024
1b83b83
Code cleanup... adds VPN app launch commands in a package of its own
diegoreymendez May 31, 2024
3af7d9c
Merges the latest from the base branch
diegoreymendez May 31, 2024
8130985
Fixes a swiftlint warning
diegoreymendez May 31, 2024
6a8fb11
Merge branch 'diego/app-launcher-code-cleanup' into diego/unix-domain…
diegoreymendez May 31, 2024
62678ee
Added a missing import
diegoreymendez Jun 3, 2024
23b3d07
Fixes build issues
diegoreymendez Jun 3, 2024
103a2ee
Merge branch 'diego/app-launcher-code-cleanup' into diego/unix-domain…
diegoreymendez Jun 3, 2024
263c65e
Final implementation
diegoreymendez Jun 5, 2024
670ef4e
Code cleanup
diegoreymendez Jun 5, 2024
cb822e7
Cleanup
diegoreymendez Jun 5, 2024
7e11af6
Code cleanup
diegoreymendez Jun 5, 2024
7d0eecd
swiftlint corrections
diegoreymendez Jun 5, 2024
1bb914c
Removes an unnecessary gitignore file
diegoreymendez Jun 5, 2024
356c33d
Resolves some merge conflicts with main
diegoreymendez Jun 5, 2024
7d9b868
Fixes a unit test
diegoreymendez Jun 5, 2024
2c9bdf2
Merges the latest from the base branch
diegoreymendez Jun 5, 2024
e7a4fe0
Removes some unnecessary code
diegoreymendez Jun 11, 2024
4146c95
Fixes several compilation warnings
diegoreymendez Jun 11, 2024
b67ade9
Unifies the VPN IPC into a single IPC client
diegoreymendez Jun 11, 2024
ed687c3
Merges the latest from main
diegoreymendez Jun 11, 2024
e86b837
Fixes UDS for our App Store builds
diegoreymendez Jun 11, 2024
b54b765
Fixes an issue with the VPN status after uninstallation
diegoreymendez Jun 11, 2024
7444d25
Renames the browser installation pixels from ipc to uds
diegoreymendez Jun 11, 2024
f6b0541
Improves the VPN agent startup logs
diegoreymendez Jun 12, 2024
39336be
Removes an unnecessary switch
diegoreymendez Jun 12, 2024
c1901dd
Rolls back unintentional changes
diegoreymendez Jun 12, 2024
456d1c1
Merge branch 'main' into diego/unix-domain-sockets
diegoreymendez Jun 12, 2024
3b80fb7
Addresses PR feedback
diegoreymendez Jun 12, 2024
37a9c7a
Rolls back an unintentional change
diegoreymendez Jun 12, 2024
2ff5397
Update DuckDuckGo/Waitlist/IPCServiceLauncher.swift
diegoreymendez Jun 12, 2024
8bb9a03
Removes an unused file
diegoreymendez Jun 12, 2024
6980b81
Merges an upstream conflict
diegoreymendez Jun 12, 2024
a686e5c
Removed some commented code
diegoreymendez Jun 12, 2024
2d83596
Better documents an empty code path
diegoreymendez Jun 12, 2024
21b481c
Adds some basic tests for UDS
diegoreymendez Jun 12, 2024
a5a495d
Resolves some swiftlint warnings
diegoreymendez Jun 12, 2024
7ea3609
Changes a fatal error for a pixel and an assertion
diegoreymendez Jun 12, 2024
9eaf4ed
Shares a resource to avoid code duplication
diegoreymendez Jun 12, 2024
0d27a05
Removes some commented code
diegoreymendez Jun 12, 2024
ce4b52c
Removes two unnecessary keychain access groups
diegoreymendez Jun 12, 2024
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
18 changes: 18 additions & 0 deletions Configuration/AppStore.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,21 @@ DBP_APP_GROUP[config=CI][sdk=*] = $(DBP_BASE_APP_GROUP).debug
DBP_APP_GROUP[config=Review][sdk=*] = $(DBP_BASE_APP_GROUP).review
DBP_APP_GROUP[config=Debug][sdk=*] = $(DBP_BASE_APP_GROUP).debug
DBP_APP_GROUP[config=Release][sdk=*] = $(DBP_BASE_APP_GROUP)

// IPC

// IMPORTANT: The reason this app group was created is because IPC through
// Unix Domain Sockets requires the socket file path to be no longer than
// 108 characters. Sandboxing requirements force us to place said socket
// within an app group container.
//
// Name coding:
// - ipc.a = ipc app store release
// - ipc.a.d = ipc app store debug
// - ipc.a.r = ipc app store review
//
IPC_APP_GROUP_BASE = $(DEVELOPMENT_TEAM).com.ddg.ipc.a
IPC_APP_GROUP[config=CI][sdk=*] = $(IPC_APP_GROUP_BASE).d
IPC_APP_GROUP[config=Review][sdk=*] = $(IPC_APP_GROUP_BASE).r
IPC_APP_GROUP[config=Debug][sdk=*] = $(IPC_APP_GROUP_BASE).d
IPC_APP_GROUP[config=Release][sdk=*] = $(IPC_APP_GROUP_BASE)
18 changes: 18 additions & 0 deletions Configuration/DeveloperID.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,21 @@ DBP_APP_GROUP[config=CI][sdk=*] = $(DBP_BASE_APP_GROUP).debug
DBP_APP_GROUP[config=Review][sdk=*] = $(DBP_BASE_APP_GROUP).review
DBP_APP_GROUP[config=Debug][sdk=*] = $(DBP_BASE_APP_GROUP).debug
DBP_APP_GROUP[config=Release][sdk=*] = $(DBP_BASE_APP_GROUP)

// IPC

// IMPORTANT: The reason this app group was created is because IPC through
// Unix Domain Sockets requires the socket file path to be no longer than
// 108 characters. Sandboxing requirements force us to place said socket
// within an app group container.
//
// Name coding:
// - ipc.d = ipc developer id release
// - ipc.d.d = ipc developer id debug
// - ipc.d.r = ipc developer id review
//
IPC_APP_GROUP_BASE = $(DEVELOPMENT_TEAM).com.ddg.ipc
IPC_APP_GROUP[config=CI][sdk=*] = $(IPC_APP_GROUP_BASE).d
IPC_APP_GROUP[config=Review][sdk=*] = $(IPC_APP_GROUP_BASE).r
IPC_APP_GROUP[config=Debug][sdk=*] = $(IPC_APP_GROUP_BASE).d
IPC_APP_GROUP[config=Release][sdk=*] = $(IPC_APP_GROUP_BASE)
27 changes: 27 additions & 0 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 9 additions & 3 deletions DuckDuckGo/Application/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,14 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
public let subscriptionManager: SubscriptionManaging
public let vpnSettings = VPNSettings(defaults: .netP)

// MARK: - VPN

private var networkProtectionSubscriptionEventHandler: NetworkProtectionSubscriptionEventHandler?

private var vpnXPCClient = VPNControllerXPCClient.shared
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason we need to store this as a property when it's already a singleton?

Copy link
Contributor Author

@diegoreymendez diegoreymendez Jun 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really. In fact storing is bad.

I changed this to use a calculated var so that we don't access global state within methods directly (when possible). This makes methods a bit more future proof in making it easier to add tests for them.


// MARK: - DBP

#if DBP
private lazy var dataBrokerProtectionSubscriptionEventHandler: DataBrokerProtectionSubscriptionEventHandler = {
let authManager = DataBrokerAuthenticationManagerBuilder.buildAuthenticationManager(subscriptionManager: subscriptionManager)
Expand Down Expand Up @@ -216,9 +223,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
appIconChanger = AppIconChanger(internalUserDecider: internalUserDecider)

// Configure Event handlers
let ipcClient = TunnelControllerIPCClient()
let tunnelController = NetworkProtectionIPCTunnelController(ipcClient: ipcClient)
let vpnUninstaller = VPNUninstaller(ipcClient: ipcClient)
let tunnelController = NetworkProtectionIPCTunnelController(ipcClient: vpnXPCClient)
let vpnUninstaller = VPNUninstaller(ipcClient: vpnXPCClient)

networkProtectionSubscriptionEventHandler = NetworkProtectionSubscriptionEventHandler(subscriptionManager: subscriptionManager,
tunnelController: tunnelController,
Expand Down
12 changes: 12 additions & 0 deletions DuckDuckGo/Common/Extensions/BundleExtension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ extension Bundle {
static let notificationsAgentProductName = "NOTIFICATIONS_AGENT_PRODUCT_NAME"
#endif

static let ipcAppGroup = "IPC_APP_GROUP"

#if DBP
static let dbpBackgroundAgentBundleId = "DBP_BACKGROUND_AGENT_BUNDLE_ID"
static let dbpBackgroundAgentProductName = "DBP_BACKGROUND_AGENT_PRODUCT_NAME"
Expand Down Expand Up @@ -104,6 +106,13 @@ extension Bundle {
return appGroup
}

var ipcAppGroupName: String {
guard let appGroup = object(forInfoDictionaryKey: Keys.ipcAppGroup) as? String else {
fatalError("Info.plist is missing \(Keys.ipcAppGroup)")
}
return appGroup
}

var isInApplicationsDirectory: Bool {
let directoryPaths = NSSearchPathForDirectoriesInDomains(.applicationDirectory, .localDomainMask, true)

Expand All @@ -129,13 +138,16 @@ extension Bundle {

enum BundleGroup {
case netP
case ipc
case dbp
case subs

var appGroupKey: String {
switch self {
case .dbp:
return "DBP_APP_GROUP"
case .ipc:
return "IPC_APP_GROUP"
case .netP:
return "NETP_APP_GROUP"
case .subs:
Expand Down
1 change: 1 addition & 0 deletions DuckDuckGo/DuckDuckGo.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<true/>
<key>com.apple.security.application-groups</key>
<array>
<string>$(IPC_APP_GROUP)</string>
<string>$(DBP_APP_GROUP)</string>
<string>$(NETP_APP_GROUP)</string>
<string>$(SUBSCRIPTION_APP_GROUP)</string>
Expand Down
1 change: 1 addition & 0 deletions DuckDuckGo/DuckDuckGoAppStore.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<true/>
<key>com.apple.security.application-groups</key>
<array>
<string>$(IPC_APP_GROUP)</string>
<string>$(DBP_APP_GROUP)</string>
<string>$(NETP_APP_GROUP)</string>
<string>$(SUBSCRIPTION_APP_GROUP)</string>
Expand Down
1 change: 1 addition & 0 deletions DuckDuckGo/DuckDuckGoAppStoreCI.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<true/>
<key>com.apple.security.application-groups</key>
<array>
<string>$(IPC_APP_GROUP)</string>
<string>$(NETP_APP_GROUP)</string>
<string>$(DBP_APP_GROUP)</string>
<string>$(SUBSCRIPTION_APP_GROUP)</string>
Expand Down
1 change: 1 addition & 0 deletions DuckDuckGo/DuckDuckGoDebug.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<true/>
<key>com.apple.security.application-groups</key>
<array>
<string>$(IPC_APP_GROUP)</string>
<string>$(DBP_APP_GROUP)</string>
<string>$(NETP_APP_GROUP)</string>
<string>$(SUBSCRIPTION_APP_GROUP)</string>
Expand Down
2 changes: 2 additions & 0 deletions DuckDuckGo/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,5 +550,7 @@
<integer>10800</integer>
<key>ViewBridgeService</key>
<false/>
<key>IPC_APP_GROUP</key>
<string>$(IPC_APP_GROUP)</string>
</dict>
</plist>
18 changes: 9 additions & 9 deletions DuckDuckGo/InfoPlist.xcstrings
View file
Open in desktop
diegoreymendez marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -7,55 +7,55 @@
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
diegoreymendez marked this conversation as resolved.
Show resolved Hide resolved
"value" : "DuckDuckGo"
}
},
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "DuckDuckGo"
"value" : "DuckDuckGo App Store"
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "DuckDuckGo"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "DuckDuckGo"
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "DuckDuckGo"
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "DuckDuckGo"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "DuckDuckGo"
}
},
"pt" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "DuckDuckGo"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "DuckDuckGo"
}
}
Expand Down
6 changes: 3 additions & 3 deletions DuckDuckGo/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26875,7 +26875,7 @@
},
"letsmove.alert.message" : {
"comment" : "Message of the alert shown if the app is launched not from the /Applications folder – suggesting to move it there",
"extractionState" : "extracted_with_value",
"extractionState" : "stale",
"localizations" : {
"de" : {
"stringUnit" : {
Expand Down Expand Up @@ -26935,7 +26935,7 @@
},
"letsmove.alert.title" : {
"comment" : "Title of the alert shown if the app is launched not from the /Applications folder – suggesting to move it there",
"extractionState" : "extracted_with_value",
"extractionState" : "stale",
"localizations" : {
"de" : {
"stringUnit" : {
Expand Down Expand Up @@ -26995,7 +26995,7 @@
},
"letsmove.could.not.move" : {
"comment" : "Error message when moving the app to the /Applications folder failed",
"extractionState" : "extracted_with_value",
"extractionState" : "stale",
"localizations" : {
"de" : {
"stringUnit" : {
Expand Down
2 changes: 2 additions & 0 deletions DuckDuckGo/LoginItems/LoginItemsManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ protocol LoginItemsManaging {
func throwingEnableLoginItems(_ items: Set<LoginItem>, log: OSLog) throws
func disableLoginItems(_ items: Set<LoginItem>)
func restartLoginItems(_ items: Set<LoginItem>, log: OSLog)

func isAnyEnabled(_ items: Set<LoginItem>) -> Bool
}

/// Class to manage the login items for the VPN and DBP
Expand Down
23 changes: 13 additions & 10 deletions DuckDuckGo/MainWindow/MainViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,11 @@ final class MainViewController: NSViewController {
fatalError("MainViewController: Bad initializer")
}

init(tabCollectionViewModel: TabCollectionViewModel? = nil, bookmarkManager: BookmarkManager = LocalBookmarkManager.shared, autofillPopoverPresenter: AutofillPopoverPresenter) {
init(tabCollectionViewModel: TabCollectionViewModel? = nil,
bookmarkManager: BookmarkManager = LocalBookmarkManager.shared,
autofillPopoverPresenter: AutofillPopoverPresenter,
vpnXPCClient: VPNControllerXPCClient = .shared) {

let tabCollectionViewModel = tabCollectionViewModel ?? TabCollectionViewModel()
self.tabCollectionViewModel = tabCollectionViewModel
self.isBurner = tabCollectionViewModel.isBurner
Expand All @@ -70,14 +74,14 @@ final class MainViewController: NSViewController {
}
#endif

let ipcClient = TunnelControllerIPCClient()
ipcClient.register { error in
vpnXPCClient.register { error in
NetworkProtectionKnownFailureStore().lastKnownFailure = KnownFailure(error)
}
let vpnUninstaller = VPNUninstaller(ipcClient: ipcClient)

let vpnUninstaller = VPNUninstaller(ipcClient: vpnXPCClient)

return NetworkProtectionNavBarPopoverManager(
ipcClient: ipcClient,
ipcClient: vpnXPCClient,
vpnUninstaller: vpnUninstaller)
}()
let networkProtectionStatusReporter: NetworkProtectionStatusReporter = {
Expand All @@ -92,14 +96,13 @@ final class MainViewController: NSViewController {
connectivityIssuesObserver = connectivityIssuesObserver ?? DisabledConnectivityIssueObserver()
controllerErrorMessageObserver = controllerErrorMessageObserver ?? ControllerErrorMesssageObserverThroughDistributedNotifications()

let ipcClient = networkProtectionPopoverManager.ipcClient
return DefaultNetworkProtectionStatusReporter(
statusObserver: ipcClient.ipcStatusObserver,
serverInfoObserver: ipcClient.ipcServerInfoObserver,
connectionErrorObserver: ipcClient.ipcConnectionErrorObserver,
statusObserver: vpnXPCClient.ipcStatusObserver,
serverInfoObserver: vpnXPCClient.ipcServerInfoObserver,
connectionErrorObserver: vpnXPCClient.ipcConnectionErrorObserver,
connectivityIssuesObserver: connectivityIssuesObserver,
controllerErrorMessageObserver: controllerErrorMessageObserver,
dataVolumeObserver: ipcClient.ipcDataVolumeObserver,
dataVolumeObserver: vpnXPCClient.ipcDataVolumeObserver,
knownFailureObserver: KnownFailureObserverThroughDistributedNotifications()
)
}()
Expand Down
1 change: 0 additions & 1 deletion DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ protocol PopoverPresenter {
}

protocol NetPPopoverManager: AnyObject {
var ipcClient: NetworkProtectionIPCClient { get }
var isShown: Bool { get }

func show(positionedBelow view: NSView, withDelegate delegate: NSPopoverDelegate) -> NSPopover
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/VPNOperationErrorRecorder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ final class ErrorInformation: NSObject, Codable {
///
final class VPNOperationErrorHistory {

private let ipcClient: TunnelControllerIPCClient
private let ipcClient: VPNControllerXPCClient
private let defaults: UserDefaults

init(ipcClient: TunnelControllerIPCClient,
init(ipcClient: VPNControllerXPCClient,
defaults: UserDefaults = .netP) {

self.ipcClient = ipcClient
Expand Down
7 changes: 0 additions & 7 deletions ...tworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,3 @@ extension NetworkProtectionLocationListCompositeRepository {
)
}
}

extension TunnelControllerIPCClient {

convenience init() {
self.init(machServiceName: Bundle.main.vpnMenuAgentBundleId)
}
}
6 changes: 3 additions & 3 deletions DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugUtilities.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import NetworkProtectionIPC
///
final class NetworkProtectionDebugUtilities {

private let ipcClient: TunnelControllerIPCClient
private let ipcClient: VPNControllerXPCClient
private let vpnUninstaller: VPNUninstaller

// MARK: - Login Items Management
Expand All @@ -46,7 +46,7 @@ final class NetworkProtectionDebugUtilities {
self.loginItemsManager = loginItemsManager
self.settings = settings

let ipcClient = TunnelControllerIPCClient()
let ipcClient = VPNControllerXPCClient.shared

self.ipcClient = ipcClient
self.vpnUninstaller = VPNUninstaller(ipcClient: ipcClient)
Expand All @@ -66,7 +66,7 @@ final class NetworkProtectionDebugUtilities {

func removeSystemExtensionAndAgents() async throws {
try await vpnUninstaller.removeSystemExtension()
vpnUninstaller.disableLoginItems()
vpnUninstaller.removeAgents()
}

func sendTestNotificationRequest() async throws {
Expand Down
4 changes: 2 additions & 2 deletions ...o/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protocol NetworkProtectionIPCClient {
func stop(completion: @escaping (Error?) -> Void)
}

extension TunnelControllerIPCClient: NetworkProtectionIPCClient {
extension VPNControllerXPCClient: NetworkProtectionIPCClient {
public var ipcStatusObserver: any NetworkProtection.ConnectionStatusObserver { connectionStatusObserver }
public var ipcServerInfoObserver: any NetworkProtection.ConnectionServerInfoObserver { serverInfoObserver }
public var ipcConnectionErrorObserver: any NetworkProtection.ConnectionErrorObserver { connectionErrorObserver }
Expand All @@ -49,7 +49,7 @@ final class NetworkProtectionNavBarPopoverManager: NetPPopoverManager {
let ipcClient: NetworkProtectionIPCClient
let vpnUninstaller: VPNUninstalling

init(ipcClient: TunnelControllerIPCClient,
init(ipcClient: VPNControllerXPCClient,
vpnUninstaller: VPNUninstalling) {
self.ipcClient = ipcClient
self.vpnUninstaller = vpnUninstaller
Expand Down
3 changes: 2 additions & 1 deletion DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/TunnelControllerProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ final class TunnelControllerProvider {
let tunnelController: NetworkProtectionIPCTunnelController

private init() {
let ipcClient = TunnelControllerIPCClient()
let ipcClient = VPNControllerXPCClient.shared
ipcClient.register { error in
NetworkProtectionKnownFailureStore().lastKnownFailure = KnownFailure(error)
}

tunnelController = NetworkProtectionIPCTunnelController(ipcClient: ipcClient)
}

Expand Down
Loading
Loading