Validate VPN errors before re-throwing them (#3490)

Task/Issue URL: https://app.asana.com/0/414709148257752/1208225499545869/f Tech Design URL: CC: Description: This PR updates the VPN to validate errors before throwing them to the OS.
duckduckgo · Nov 3, 2024 · 9184e92 · 9184e92
1 parent f131518
commit 9184e92
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -14684,7 +14684,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 202.4.0;
+				version = 203.0.0;
 			};
 		};
 		9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "80894bf69fe789e41b13f3de6be97f1300ca56e5",
-        "version" : "202.4.0"
+        "revision" : "45261df2963fc89094e169f9f2d0d9aa098093f3",
+        "version" : "203.0.0"
       }
     },
     {

diff --git a/...DuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift b/...DuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift
@@ -118,6 +118,8 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
     case networkProtectionConfigurationPixelTest
     case networkProtectionConfigurationFailedToParse(_ error: Error)
 
+    case networkProtectionMalformedErrorDetected(_ error: Error)
+
     case networkProtectionUnhandledError(function: String, line: Int, error: Error)
 
     /// Name of the pixel event
@@ -348,6 +350,9 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
         case .networkProtectionConfigurationFailedToParse:
             return "netp_ev_configuration_failed_to_parse"
 
+        case .networkProtectionMalformedErrorDetected:
+            return "netp_malformed_error_detected"
+
         case .networkProtectionUnhandledError:
             return "netp_unhandled_error"
         }
@@ -466,7 +471,8 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
                 .networkProtectionDNSUpdateCustom,
                 .networkProtectionDNSUpdateDefault,
                 .networkProtectionConfigurationInvalidPayload,
-                .networkProtectionConfigurationPixelTest:
+                .networkProtectionConfigurationPixelTest,
+                .networkProtectionMalformedErrorDetected:
             return nil
         }
     }
@@ -495,7 +501,8 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
                 .networkProtectionSystemExtensionActivationFailure(let error),
                 .networkProtectionServerMigrationFailure(let error),
                 .networkProtectionConfigurationErrorLoadingCachedConfig(let error),
-                .networkProtectionConfigurationFailedToParse(let error):
+                .networkProtectionConfigurationFailedToParse(let error),
+                .networkProtectionMalformedErrorDetected(let error):
             return error
         case .networkProtectionActiveUser,
                 .networkProtectionNewUser,

diff --git a/...kProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift b/...kProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
@@ -399,6 +399,11 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                 NetworkProtectionPixelEvent.networkProtectionTunnelStartAttemptOnDemandWithoutAccessToken,
                 frequency: .dailyAndCount,
                 includeAppVersionParameter: true)
+        case .malformedErrorDetected(let error):
+            PixelKit.fire(
+                NetworkProtectionPixelEvent.networkProtectionMalformedErrorDetected(error),
+                frequency: .dailyAndCount,
+                includeAppVersionParameter: true)
         }
     }
 

diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
@@ -29,7 +29,7 @@ let package = Package(
             targets: ["DataBrokerProtection"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "202.4.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "203.0.0"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
         .package(path: "../Freemium"),

diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -32,7 +32,7 @@ let package = Package(
         .library(name: "VPNAppLauncher", targets: ["VPNAppLauncher"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "202.4.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "203.0.0"),
         .package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.3"),
         .package(path: "../AppLauncher"),
         .package(path: "../UDSHelper"),

diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
             targets: ["SubscriptionUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "202.4.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "203.0.0"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [