Handle expired entitlement in NetP

Sources/NetworkProtection/PacketTunnelProvider.swift

@@ -124,6 +124,10 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
 
     private let settings: VPNSettings
 
+    // MARK: - User Defaults
+
+    private let defaults: UserDefaults
+
     // MARK: - Server Selection
 
     public var lastSelectedServerInfo: NetworkProtectionServerInfo? {
@@ -299,6 +303,7 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
                 debugEvents: EventMapping<NetworkProtectionError>?,
                 providerEvents: EventMapping<Event>,
                 settings: VPNSettings,
+                defaults: UserDefaults,
                 isSubscriptionEnabled: Bool,
                 entitlementCheck: (() async -> Result<Bool, Error>)?) {
         os_log("[+] PacketTunnelProvider", log: .networkProtectionMemoryLog, type: .debug)
@@ -311,6 +316,7 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
         self.tunnelHealth = tunnelHealthStore
         self.controllerErrorStore = controllerErrorStore
         self.settings = settings
+        self.defaults = defaults
         self.isSubscriptionEnabled = isSubscriptionEnabled
         self.entitlementCheck = isSubscriptionEnabled ? entitlementCheck : nil
 
@@ -775,8 +781,7 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
             )
         } catch {
             if isSubscriptionEnabled, let error = error as? NetworkProtectionError, case .vpnAccessRevoked = error {
-                os_log("🔵 Expired subscription", log: .networkProtection, type: .error)
-                settings.enableEntitlementMessaging()
+                await handleInvalidEntitlement(attemptsShutdown: false)
                 throw TunnelError.vpnAccessRevoked
             }
 
@@ -795,13 +800,6 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
         return configurationResult.0
     }
 
-    /// Placeholder configuration to switch to when the entitlement expires
-    /// This will block all traffic
-    @MainActor
-    private func updatePlaceholderTunnelConfiguration() async throws {
-        // todo
-    }
-
     // MARK: - App Messages
 
     // swiftlint:disable:next cyclomatic_complexity
@@ -866,7 +864,7 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
         settings.apply(change: change)
     }
 
-    // swiftlint:disable:next cyclomatic_complexity function_body_length
+    // swiftlint:disable:next cyclomatic_complexity
     private func handleSettingsChange(_ change: VPNSettings.Change, completionHandler: ((Data?) -> Void)? = nil) {
         switch change {
         case .setExcludeLocalNetworks:
@@ -908,15 +906,6 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
                 }
                 completionHandler?(nil)
             }
-        case .setShowEntitlementNotification:
-            // todo - https://app.asana.com/0/0/1206409081785857/f
-            if settings.showEntitlementNotification {
-                notificationsPresenter.showEntitlementNotification { [weak self] error in
-                    guard error == nil else { return }
-                    self?.settings.apply(change: .setShowEntitlementNotification(false))
-                }
-            }
-            completionHandler?(nil)
         case .setConnectOnLogin,
                 .setIncludeAllNetworks,
                 .setEnforceRoutes,
@@ -926,8 +915,7 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
                 .setShowInMenuBar,
                 .setVPNFirstEnabled,
                 .setNetworkPathChange,
-                .setDisableRekeying,
-                .setShowEntitlementAlert:
+                .setDisableRekeying:
             // Intentional no-op, as some setting changes don't require any further operation
             completionHandler?(nil)
         }
@@ -943,8 +931,10 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
         case .sendTestNotification:
             handleSendTestNotification(completionHandler: completionHandler)
         case .disableConnectOnDemandAndShutDown:
-            if #available(iOS 17, *) {
-                handleShutDown(completionHandler: completionHandler)
+            Task { [weak self] in
+                await self?.attemptShutdown {
+                    completionHandler?(nil)
+                }
             }
         case .removeVPNConfiguration:
             // Since the VPN configuration is being removed we may as well reset all state
@@ -1193,20 +1183,46 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
         guard isSubscriptionEnabled, let entitlementCheck else { return }
 
         await entitlementMonitor.start(entitlementCheck: entitlementCheck) { [weak self] result in
+            /// Attempt tunnel shutdown & show messaging iff the entitlement is verified to be invalid
+            /// Ignore otherwise
             switch result {
-            case .validEntitlement:
-                self?.settings.resetEntitlementMessaging()
             case .invalidEntitlement:
-                self?.settings.enableEntitlementMessaging()
                 Task { [weak self] in
-                    await self?.attemptToShutdown()
+                    await self?.handleInvalidEntitlement(attemptsShutdown: true)
                 }
-            case .error:
+            case .validEntitlement, .error:
                 break
             }
         }
     }
 
+    @MainActor
+    private func handleInvalidEntitlement(attemptsShutdown: Bool) async {
+        defaults.enableEntitlementMessaging()
+        notificationsPresenter.showEntitlementNotification()
+
+        await stopMonitors()
+
+        // We add a delay here so the notification has a chance to show up
+        try? await Task.sleep(interval: .seconds(5))
+
+        if attemptsShutdown {
+            await attemptShutdown()
+        }
+    }
+
+    // Attempt to shut down the tunnel
+    // On iOS 16 and below, as a workaround, we rekey to force a 403 error so that the tunnel fails to restart
+    @MainActor
+    private func attemptShutdown(completion: (() -> Void)? = nil) async {
+        if #available(iOS 17, *) {
+            handleShutDown()
+        } else {
+            await rekey()
+        }
+        completion?()
+    }
+
     @MainActor
     public func startMonitors(testImmediately: Bool) async throws {
         await startTunnelFailureMonitor()
@@ -1236,16 +1252,6 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
         return true
     }
 
-    private func attemptToShutdown() async {
-        await stopMonitors()
-
-        if #available(iOS 17, *) {
-            handleShutDown()
-        } else {
-            try? await updatePlaceholderTunnelConfiguration()
-        }
-    }
-
     // MARK: - Connection Tester
 
     private enum ConnectionTesterError: Error {

Sources/NetworkProtection/Settings/Extensions/UserDefaults+showEntitlementMessaging.swift

@@ -22,11 +22,11 @@ import Common
 
 extension UserDefaults {
     private var showEntitlementAlertKey: String {
-        "networkProtectionShowEntitlementAlertRawValue"
+        "showEntitlementAlert"
     }
 
     @objc
-    dynamic var showEntitlementAlert: Bool {
+    public dynamic var showEntitlementAlert: Bool {
         get {
             value(forKey: showEntitlementAlertKey) as? Bool ?? false
         }
@@ -43,16 +43,12 @@ extension UserDefaults {
         }
     }
 
-    var showEntitlementAlertPublisher: AnyPublisher<Bool, Never> {
-        publisher(for: \.showEntitlementAlert).eraseToAnyPublisher()
-    }
-
     private var showEntitlementNotificationKey: String {
-        "networkProtectionShowEntitlementNotificationRawValue"
+        "showEntitlementNotification"
     }
 
     @objc
-    dynamic var showEntitlementNotification: Bool {
+    public dynamic var showEntitlementNotification: Bool {
         get {
             value(forKey: showEntitlementNotificationKey) as? Bool ?? false
         }
@@ -69,12 +65,23 @@ extension UserDefaults {
         }
     }
 
-    var showEntitlementNotificationPublisher: AnyPublisher<Bool, Never> {
-        publisher(for: \.showEntitlementNotification).eraseToAnyPublisher()
+    public func enableEntitlementMessaging() {
+        showEntitlementAlert = true
+        showEntitlementNotification = true
+
+#if os(iOS)
+        CFNotificationCenterPostNotification(CFNotificationCenterGetDarwinNotifyCenter(),
+                                             CFNotificationName(rawValue: Notification.Name.vpnEntitlementMessagingDidChange.rawValue as CFString),
+                                             nil, nil, true)
+#endif
     }
 
-    func resetEntitlementMessaging() {
+    public func resetEntitlementMessaging() {
         removeObject(forKey: showEntitlementAlertKey)
         removeObject(forKey: showEntitlementNotificationKey)
     }
 }
+
+public extension Notification.Name {
+    static let vpnEntitlementMessagingDidChange = Notification.Name("com.duckduckgo.network-protection.entitlement-messaging-changed")
+}

Sources/NetworkProtection/Settings/VPNSettings.swift

@@ -18,6 +18,7 @@
 
 import Combine
 import Foundation
+import Common
 
 /// Persists and publishes changes to tunnel settings.
 ///
@@ -41,8 +42,6 @@ public final class VPNSettings {
         case setVPNFirstEnabled(_ vpnFirstEnabled: Date?)
         case setNetworkPathChange(_ newPath: String?)
         case setDisableRekeying(_ disableRekeying: Bool)
-        case setShowEntitlementAlert(_ showsAlert: Bool)
-        case setShowEntitlementNotification(_ showsNotification: Bool)
     }
 
     public enum RegistrationKeyValidity: Codable, Equatable {
@@ -185,20 +184,6 @@ public final class VPNSettings {
                 Change.setDisableRekeying(disableRekeying)
             }.eraseToAnyPublisher()
 
-        let showEntitlementAlertPublisher = showEntitlementAlertPublisher
-            .dropFirst()
-            .removeDuplicates()
-            .map { showsAlert in
-                Change.setShowEntitlementAlert(showsAlert)
-            }.eraseToAnyPublisher()
-
-        let showEntitlementNotificationPublisher = showEntitlementNotificationPublisher
-            .dropFirst()
-            .removeDuplicates()
-            .map { showsNotification in
-                Change.setShowEntitlementNotification(showsNotification)
-            }.eraseToAnyPublisher()
-
         return Publishers.MergeMany(
             connectOnLoginPublisher,
             includeAllNetworksPublisher,
@@ -211,8 +196,6 @@ public final class VPNSettings {
             showInMenuBarPublisher,
             vpnFirstEnabledPublisher,
             networkPathChangePublisher,
-            showEntitlementAlertPublisher,
-            showEntitlementNotificationPublisher,
             disableRekeyingPublisher).eraseToAnyPublisher()
     }()
 
@@ -267,10 +250,6 @@ public final class VPNSettings {
                 newPath: newPath ?? "unknown")
         case .setDisableRekeying(let disableRekeying):
             self.disableRekeying = disableRekeying
-        case .setShowEntitlementAlert(let showsAlert):
-            self.showEntitlementAlert = showsAlert
-        case .setShowEntitlementNotification(let showsNotification):
-            self.showEntitlementNotification = showsNotification
         }
     }
     // swiftlint:enable cyclomatic_complexity
@@ -510,43 +489,4 @@ public final class VPNSettings {
             defaults.networkProtectionSettingDisableRekeying = newValue
         }
     }
-
-    // MARK: - Whether to show expired entitlement messaging
-
-    public var showEntitlementAlertPublisher: AnyPublisher<Bool, Never> {
-        defaults.showEntitlementAlertPublisher
-    }
-
-    public var showEntitlementAlert: Bool {
-        get {
-            defaults.showEntitlementAlert
-        }
-
-        set {
-            defaults.showEntitlementAlert = newValue
-        }
-    }
-
-    public var showEntitlementNotificationPublisher: AnyPublisher<Bool, Never> {
-        defaults.showEntitlementNotificationPublisher
-    }
-
-    public var showEntitlementNotification: Bool {
-        get {
-            defaults.showEntitlementNotification
-        }
-
-        set {
-            defaults.showEntitlementNotification = newValue
-        }
-    }
-
-    public func enableEntitlementMessaging() {
-        apply(change: .setShowEntitlementAlert(true))
-        apply(change: .setShowEntitlementNotification(true))
-    }
-
-    public func resetEntitlementMessaging() {
-        defaults.resetEntitlementMessaging()
-    }
 }

Sources/NetworkProtection/Status/UserNotifications/NetworkProtectionNotificationsPresenter.swift

@@ -39,5 +39,5 @@ public protocol NetworkProtectionNotificationsPresenter {
     func showTestNotification()
 
     /// Present a "expired subscription" notification to the user.
-    func showEntitlementNotification(completion: @escaping (Error?) -> Void)
+    func showEntitlementNotification()
 }

Sources/NetworkProtection/Status/UserNotifications/NetworkProtectionNotificationsPresenterTogglableDecorator.swift

@@ -20,10 +20,12 @@ import Foundation
 
 final public class NetworkProtectionNotificationsPresenterTogglableDecorator: NetworkProtectionNotificationsPresenter {
     private let settings: VPNSettings
+    private let defaults: UserDefaults
     private let wrappeePresenter: NetworkProtectionNotificationsPresenter
 
-    public init(settings: VPNSettings, wrappee: NetworkProtectionNotificationsPresenter) {
+    public init(settings: VPNSettings, defaults: UserDefaults, wrappee: NetworkProtectionNotificationsPresenter) {
         self.settings = settings
+        self.defaults = defaults
         self.wrappeePresenter = wrappee
     }
 
@@ -57,7 +59,10 @@ final public class NetworkProtectionNotificationsPresenterTogglableDecorator: Ne
         }
     }
 
-    public func showEntitlementNotification(completion: @escaping (Error?) -> Void) {
-        wrappeePresenter.showEntitlementNotification(completion: completion)
+    public func showEntitlementNotification() {
+        if defaults.showEntitlementNotification {
+            defaults.showEntitlementNotification = false
+            wrappeePresenter.showEntitlementNotification()
+        }
     }
 }