From be68a366bb3e11a93070e4356f29f9b9a41d6fa3 Mon Sep 17 00:00:00 2001
From: Jamil <jamilbk@users.noreply.github.com>
Date: Tue, 23 Jan 2024 14:21:52 -0800
Subject: [PATCH] fix(apple): Enforce types when encoding
 getSystemDefaultResolvers to prevent tunnel crash (#3367)

Fixes an edge case where an invalid formatted String could cause the
tunnel network extension to crash.
---
 .../CallbackHandler.swift                       | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/swift/apple/FirezoneNetworkExtension/CallbackHandler.swift b/swift/apple/FirezoneNetworkExtension/CallbackHandler.swift
index 0b9cfd3af..3974c12e5 100644
--- a/swift/apple/FirezoneNetworkExtension/CallbackHandler.swift
+++ b/swift/apple/FirezoneNetworkExtension/CallbackHandler.swift
@@ -30,7 +30,7 @@ public protocol CallbackHandlerDelegate: AnyObject {
 
 public class CallbackHandler {
   public weak var delegate: CallbackHandlerDelegate?
-  private var systemDefaultResolvers: RustString = "[]".intoRustString()
+  private var systemDefaultResolvers: [String] = []
   private let logger = Logger.make(for: CallbackHandler.self)
 
   func onSetInterfaceConfig(
@@ -94,15 +94,7 @@ public class CallbackHandler {
   func setSystemDefaultResolvers(resolvers: [String]) {
     logger.log(
       "CallbackHandler.setSystemDefaultResolvers: \(resolvers, privacy: .public)")
-    do {
-      self.systemDefaultResolvers = try String(
-        decoding: JSONEncoder().encode(resolvers), as: UTF8.self
-      )
-      .intoRustString()
-    } catch {
-      logger.log("CallbackHandler.setSystemDefaultResolvers: \(error, privacy: .public)")
-      self.systemDefaultResolvers = "[]".intoRustString()
-    }
+    self.systemDefaultResolvers = resolvers
   }
 
   func getSystemDefaultResolvers() -> RustString {
@@ -110,6 +102,9 @@ public class CallbackHandler {
       "CallbackHandler.getSystemDefaultResolvers: \(self.systemDefaultResolvers, privacy: .public)"
     )
 
-    return systemDefaultResolvers
+    return try! String(
+      decoding: JSONEncoder().encode(self.systemDefaultResolvers),
+      as: UTF8.self
+    ).intoRustString()
   }
 }