Merge branch 'release/141.1.2-1'

duckduckgo · May 3, 2024 · dedd5ef · dedd5ef
2 parents 7c41d69 + 35730c7
commit dedd5ef
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 1 deletion.
diff --git a/Sources/NetworkProtection/Networking/NetworkProtectionClient.swift b/Sources/NetworkProtection/Networking/NetworkProtectionClient.swift
@@ -79,6 +79,27 @@ public enum NetworkProtectionClientError: CustomNSError, NetworkProtectionErrorC
         case .accessDenied: return 13
         }
     }
+
+    public var errorUserInfo: [String: Any] {
+        switch self {
+        case .failedToFetchLocationList(let error),
+                .failedToParseLocationListResponse(let error),
+                .failedToFetchServerList(let error),
+                .failedToParseServerListResponse(let error),
+                .failedToFetchRegisteredServers(let error),
+                .failedToParseRegisteredServersResponse(let error),
+                .failedToRedeemInviteCode(let error),
+                .failedToParseRedeemResponse(let error):
+            return [NSUnderlyingErrorKey: error as NSError]
+        case .failedToEncodeRegisterKeyRequest,
+                .failedToEncodeRedeemRequest,
+                .invalidInviteCode,
+                .failedToRetrieveAuthToken,
+                .invalidAuthToken,
+                .accessDenied:
+            return [:]
+        }
+    }
 }
 
 struct RegisterKeyRequestBody: Encodable {

diff --git a/Sources/NetworkProtection/WireGuardKit/WireGuardAdapter.swift b/Sources/NetworkProtection/WireGuardKit/WireGuardAdapter.swift
@@ -13,7 +13,7 @@ public enum WireGuardAdapterErrorInvalidStateReason: String {
     case updatedTunnelWhileStopped
 }
 
-public enum WireGuardAdapterError: Error {
+public enum WireGuardAdapterError: CustomNSError {
     /// Failure to locate tunnel file descriptor.
     case cannotLocateTunnelFileDescriptor
 
@@ -28,6 +28,35 @@ public enum WireGuardAdapterError: Error {
 
     /// Failure to start WireGuard backend.
     case startWireGuardBackend(Int32)
+
+    public var errorCode: Int {
+        switch self {
+        case .cannotLocateTunnelFileDescriptor: return 100
+        case .invalidState: return 101
+        case .dnsResolution: return 102
+        case .setNetworkSettings: return 103
+        case .startWireGuardBackend: return 104
+        }
+    }
+
+    public var errorUserInfo: [String: Any] {
+        switch self {
+        case .cannotLocateTunnelFileDescriptor,
+                .invalidState:
+            return [:]
+        case .dnsResolution(let errors):
+            guard let firstError = errors.first else {
+                return [:]
+            }
+
+            return [NSUnderlyingErrorKey: firstError as NSError]
+        case .setNetworkSettings(let error):
+            return [NSUnderlyingErrorKey: error as NSError]
+        case .startWireGuardBackend(let code):
+            let error = NSError(domain: "startWireGuardBackend", code: Int(code))
+            return [NSUnderlyingErrorKey: error as NSError]
+        }
+    }
 }
 
 /// Enum representing internal state of the `WireGuardAdapter`