Merge branch 'main' into brad/new-breakage-parameters

duckduckgo · Mar 14, 2024 · a8d76cd · a8d76cd
2 parents 5b48b05 + 1295a22
commit a8d76cd
Show file tree

Hide file tree

Showing 34 changed files with 213 additions and 312 deletions.
diff --git a/Package.swift b/Package.swift
@@ -62,7 +62,6 @@ let package = Package(
                 "UserScript",
                 "ContentBlocking",
                 "SecureStorage",
-                .product(name: "Macros", package: "apple-toolbox"),
             ],
             resources: [
                 .process("ContentBlocking/UserScripts/contentblockerrules.js"),
@@ -150,7 +149,6 @@ let package = Package(
                 "Common",
                 .product(name: "DDGSyncCrypto", package: "sync_crypto"),
                 "Networking",
-                .product(name: "Macros", package: "apple-toolbox"),
             ],
             resources: [
                 .process("SyncMetadata.xcdatamodeld"),
@@ -283,7 +281,6 @@ let package = Package(
             dependencies: [
                 "Networking",
                 "Persistence",
-                .product(name: "Macros", package: "apple-toolbox"),
             ],
             plugins: [swiftlintPlugin]
         ),
@@ -293,7 +290,6 @@ let package = Package(
                 .target(name: "WireGuardC"),
                 .product(name: "WireGuard", package: "wireguard-apple"),
                 "Common",
-                .product(name: "Macros", package: "apple-toolbox"),
             ],
             swiftSettings: [
                 .define("DEBUG", .when(configuration: .debug))
@@ -330,7 +326,6 @@ let package = Package(
             name: "Subscription",
             dependencies: [
                 "Common",
-                .product(name: "Macros", package: "apple-toolbox"),
             ],
             swiftSettings: [
                 .define("DEBUG", .when(configuration: .debug))
@@ -375,7 +370,6 @@ let package = Package(
                 "RemoteMessaging", // Move tests later (lots of test dependencies in BSK)
                 "SecureStorageTestsUtils",
                 "TestUtils",
-                .product(name: "Macros", package: "apple-toolbox"),
             ],
             resources: [
                 .copy("Resources")
@@ -387,7 +381,6 @@ let package = Package(
             dependencies: [
                 "DDGSync",
                 "TestUtils",
-                .product(name: "Macros", package: "apple-toolbox"),
             ],
             plugins: [swiftlintPlugin]
         ),
@@ -402,7 +395,6 @@ let package = Package(
             name: "CommonTests",
             dependencies: [
                 "Common",
-                .product(name: "Macros", package: "apple-toolbox"),
             ],
             plugins: [swiftlintPlugin]
         ),
@@ -418,7 +410,6 @@ let package = Package(
             dependencies: [
                 "Navigation",
                 .product(name: "Swifter", package: "swifter"),
-                .product(name: "Macros", package: "apple-toolbox"),
             ],
             resources: [
                 .copy("Resources")
@@ -485,7 +476,6 @@ let package = Package(
             dependencies: [
                 "SecureStorage",
                 "SecureStorageTestsUtils",
-                .product(name: "Macros", package: "apple-toolbox"),
             ],
             plugins: [swiftlintPlugin]
         ),
@@ -494,7 +484,6 @@ let package = Package(
             dependencies: [
                 "PrivacyDashboard",
                 "TestUtils",
-                .product(name: "Macros", package: "apple-toolbox"),
             ],
             plugins: [swiftlintPlugin]
         ),

diff --git a/Sources/BrowserServicesKit/Suggestions/SuggestionLoading.swift b/Sources/BrowserServicesKit/Suggestions/SuggestionLoading.swift
@@ -17,7 +17,6 @@
 //
 
 import Foundation
-import Macros
 
 public protocol SuggestionLoading: AnyObject {
 

diff --git a/Sources/DDGSync/DDGSyncing.swift b/Sources/DDGSync/DDGSyncing.swift
@@ -20,7 +20,6 @@ import BrowserServicesKit
 import Combine
 import DDGSyncCrypto
 import Foundation
-import Macros
 
 public enum SyncAuthState: String, Sendable, Codable {
     /// Sync engine is not initialized.
@@ -177,9 +176,9 @@ public enum ServerEnvironment: LosslessStringConvertible {
     var baseURL: URL {
         switch self {
         case .development:
-            return #URL("https://dev-sync-use.duckduckgo.com")
+            return URL(string: "https://dev-sync-use.duckduckgo.com")!
         case .production:
-            return #URL("https://sync.duckduckgo.com")
+            return URL(string: "https://sync.duckduckgo.com")!
         }
     }
 

diff --git a/Sources/NetworkProtection/AppLaunching.swift b/Sources/NetworkProtection/AppLaunching.swift
diff --git a/Sources/NetworkProtection/NetworkProtectionDeviceManager.swift b/Sources/NetworkProtection/NetworkProtectionDeviceManager.swift
@@ -138,15 +138,28 @@ public actor NetworkProtectionDeviceManager: NetworkProtectionDeviceManagement {
         if regenerateKey {
             keyPair = keyStore.newKeyPair()
         } else {
-            keyPair = keyStore.currentKeyPair() ?? keyStore.newKeyPair()
+            // Temporary code added on 2024-03-12 to fix a previous issue where users had a really long
+            // key expiration date.  We should remove this after a month or so.
+            if let existingKeyPair = keyStore.currentKeyPair(),
+               existingKeyPair.expirationDate > Date().addingTimeInterval(TimeInterval.day) {
+
+                keyPair = keyStore.newKeyPair()
+            } else {
+                // This is the regular code to restore when the above code is removed.
+                keyPair = keyStore.currentKeyPair() ?? keyStore.newKeyPair()
+            }
         }
 
         let (selectedServer, newExpiration) = try await register(keyPair: keyPair, selectionMethod: selectionMethod)
         os_log("Server registration successul", log: .networkProtection)
 
         keyStore.updateKeyPair(keyPair)
 
-        if let newExpiration {
+        // We only update the expiration date if it happens before our client-set expiration date.
+        // This way we respect the client-set expiration date, unless the server has set an earlier
+        // expiration for whatever reason (like if the subscription is known to expire).
+        //
+        if let newExpiration, newExpiration < keyPair.expirationDate {
             keyPair = KeyPair(privateKey: keyPair.privateKey, expirationDate: newExpiration)
             keyStore.updateKeyPair(keyPair)
         }
@@ -224,9 +237,7 @@ public actor NetworkProtectionDeviceManager: NetworkProtectionDeviceManagement {
                 // If we're looking to exclude a server we should have a few other options available.  If we can't find any
                 // then it means theres an inconsistency in the server list that was returned.
                 errorEvents?.fire(NetworkProtectionError.serverListInconsistency)
-
-                let cachedServer = try cachedServer(registeredWith: keyPair)
-                return (cachedServer, nil)
+                throw NetworkProtectionError.serverListInconsistency
             }
 
             selectedServer = registeredServer
@@ -238,9 +249,7 @@ public actor NetworkProtectionDeviceManager: NetworkProtectionDeviceManagement {
             }
 
             handle(clientError: error)
-
-            let cachedServer = try cachedServer(registeredWith: keyPair)
-            return (cachedServer, nil)
+            throw error
         }
     }
 

diff --git a/Sources/NetworkProtection/Networking/NetworkProtectionClient.swift b/Sources/NetworkProtection/Networking/NetworkProtectionClient.swift
@@ -17,7 +17,6 @@
 //
 
 import Foundation
-import Macros
 
 public enum NetworkProtectionAuthenticationMethod {
     case inviteCode(String)
@@ -119,8 +118,8 @@ public struct AuthenticationFailureResponse: Decodable {
 final class NetworkProtectionBackendClient: NetworkProtectionClient {
 
     enum Constants {
-        static let productionEndpoint = #URL("https://controller.netp.duckduckgo.com")
-        static let stagingEndpoint = #URL("https://staging.netp.duckduckgo.com")
+        static let productionEndpoint = URL(string: "https://controller.netp.duckduckgo.com")!
+        static let stagingEndpoint = URL(string: "https://staging.netp.duckduckgo.com")!
     }
 
     private enum DecoderError: Error {

diff --git a/Sources/NetworkProtection/PacketTunnelProvider.swift b/Sources/NetworkProtection/PacketTunnelProvider.swift
@@ -595,7 +595,7 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
                                                                                 serverSelectionMethod: currentServerSelectionMethod,
                                                                                 includedRoutes: includedRoutes ?? [],
                                                                                 excludedRoutes: settings.excludedRanges,
-                                                                                regenerateKey: false)
+                                                                                regenerateKey: true)
                 startTunnel(with: tunnelConfiguration, onDemand: onDemand, completionHandler: completionHandler)
                 os_log("🔵 Done generating tunnel config", log: .networkProtection, type: .info)
             } catch {

diff --git a/Sources/NetworkProtection/Settings/VPNSettings.swift b/Sources/NetworkProtection/Settings/VPNSettings.swift
@@ -18,7 +18,6 @@
 
 import Combine
 import Foundation
-import Macros
 
 /// Persists and publishes changes to tunnel settings.
 ///
@@ -80,9 +79,9 @@ public final class VPNSettings {
         public var endpointURL: URL {
             switch self {
             case .production:
-                return #URL("https://controller.netp.duckduckgo.com")
+                return URL(string: "https://controller.netp.duckduckgo.com")!
             case .staging:
-                return #URL("https://staging1.netp.duckduckgo.com")
+                return URL(string: "https://staging1.netp.duckduckgo.com")!
             }
         }
     }

diff --git a/Sources/NetworkProtectionTestUtils/MockAppLauncher.swift b/Sources/NetworkProtectionTestUtils/MockAppLauncher.swift
diff --git a/Sources/Subscription/Services/AuthService.swift b/Sources/Subscription/Services/AuthService.swift
@@ -18,7 +18,6 @@
 
 import Common
 import Foundation
-import Macros
 
 public struct AuthService: APIService {
 
@@ -30,9 +29,9 @@ public struct AuthService: APIService {
     public static var baseURL: URL {
         switch SubscriptionPurchaseEnvironment.currentServiceEnvironment {
         case .production:
-            #URL("https://quack.duckduckgo.com/api/auth")
+            URL(string: "https://quack.duckduckgo.com/api/auth")!
         case .staging:
-            #URL("https://quackdev.duckduckgo.com/api/auth")
+            URL(string: "https://quackdev.duckduckgo.com/api/auth")!
         }
     }
 

diff --git a/Sources/Subscription/Services/SubscriptionService.swift b/Sources/Subscription/Services/SubscriptionService.swift
@@ -18,7 +18,6 @@
 
 import Common
 import Foundation
-import Macros
 
 public final class SubscriptionService: APIService {
 
@@ -30,9 +29,9 @@ public final class SubscriptionService: APIService {
     public static var baseURL: URL {
         switch SubscriptionPurchaseEnvironment.currentServiceEnvironment {
         case .production:
-            #URL("https://subscriptions.duckduckgo.com/api")
+            URL(string: "https://subscriptions.duckduckgo.com/api")!
         case .staging:
-            #URL("https://subscriptions-dev.duckduckgo.com/api")
+            URL(string: "https://subscriptions-dev.duckduckgo.com/api")!
         }
     }
 

diff --git a/Sources/Subscription/URL+Subscription.swift b/Sources/Subscription/URL+Subscription.swift
@@ -17,16 +17,15 @@
 //
 
 import Foundation
-import Macros
 
 public extension URL {
 
     static var subscriptionBaseURL: URL {
         switch SubscriptionPurchaseEnvironment.currentServiceEnvironment {
         case .production:
-            #URL("https://duckduckgo.com/subscriptions")
+            URL(string: "https://duckduckgo.com/subscriptions")!
         case .staging:
-            #URL("https://duckduckgo.com/subscriptions?environment=staging")
+            URL(string: "https://duckduckgo.com/subscriptions?environment=staging")!
         }
     }
 
@@ -35,7 +34,7 @@ public extension URL {
     }
 
     static var subscriptionFAQ: URL {
-        #URL("https://duckduckgo.com/about")
+        URL(string: "https://duckduckgo.com/about")!
     }
 
     // MARK: - Subscription Email
@@ -54,17 +53,17 @@ public extension URL {
     // MARK: - App Store app manage subscription URL
 
     static var manageSubscriptionsInAppStoreAppURL: URL {
-        #URL("macappstores://apps.apple.com/account/subscriptions")
+        URL(string: "macappstores://apps.apple.com/account/subscriptions")!
     }
 
     // MARK: - Identity Theft Restoration
 
     static var identityTheftRestoration: URL {
         switch SubscriptionPurchaseEnvironment.currentServiceEnvironment {
         case .production:
-            #URL("https://duckduckgo.com/identity-theft-restoration")
+            URL(string: "https://duckduckgo.com/identity-theft-restoration")!
         case .staging:
-            #URL("https://duckduckgo.com/identity-theft-restoration?environment=staging")
+            URL(string: "https://duckduckgo.com/identity-theft-restoration?environment=staging")!
         }
     }
 }
diff --git a/Sources/TestUtils/Utils/HTTPURLResponseExtension.swift b/Sources/TestUtils/Utils/HTTPURLResponseExtension.swift
@@ -17,13 +17,12 @@
 //
 
 import Foundation
-import Macros
 import Networking
 
 extension HTTPURLResponse {
 
     static let testEtag = "test-etag"
-    static let testUrl = #URL("http://www.example.com")
+    static let testUrl = URL(string: "http://www.example.com")!
 
     static let ok = HTTPURLResponse(url: testUrl,
                                     statusCode: 200,
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ @@
     //
     import Foundation
-    import Macros
     public protocol SuggestionLoading: AnyObject {
@@ Expand Down @@