Merge branch 'main' into colin/xpc

Author: coadler

Coder Desktop/Coder Desktop.xcodeproj/project.pbxproj

@@ -1,5 +1,5 @@
 {
-  "originHash" : "ec40e522ec1a2416e8e8f5cbe97424ab3e4a614e6ef453c10ea28e84e88b6771",
+  "originHash" : "c41f63aa01c78f450e2232efbefcd30874995ad120db77fa5942062d6f813891",
   "pins" : [
     {
       "identity" : "fluid-menu-bar-extra",
@@ -18,6 +18,15 @@
         "revision" : "e0c7eebc5a4465a3c4680764f26b7a61f567cdaf"
       }
     },
+    {
+      "identity" : "launchatlogin-modern",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/sindresorhus/LaunchAtLogin-modern",
+      "state" : {
+        "revision" : "a04ec1c363be3627734f6dad757d82f5d4fa8fcc",
+        "version" : "1.1.0"
+      }
+    },
     {
       "identity" : "mocker",
       "kind" : "remoteSourceControl",
@@ -41,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/SimplyDanny/SwiftLintPlugins",
       "state" : {
-        "revision" : "f9731bef175c3eea3a0ca960f1be78fcc2bc7853",
-        "version" : "0.57.1"
+        "revision" : "fac0c3d3ac69b15ea5382275dbbd5e583a2e05fa",
+        "version" : "0.58.0"
       }
     },
     {

Coder Desktop/Coder Desktop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -32,15 +32,7 @@ enum About {
 
     @MainActor
     static func open() {
-        #if compiler(>=5.9) && canImport(AppKit)
-            if #available(macOS 14, *) {
-                NSApp.activate()
-            } else {
-                NSApp.activate(ignoringOtherApps: true)
-            }
-        #else
-            NSApp.activate(ignoringOtherApps: true)
-        #endif
+        appActivate()
         NSApp.orderFrontStandardAboutPanel(options: [
             .credits: credits,
         ])

Coder Desktop/Coder Desktop/About.swift

@@ -11,29 +11,39 @@ struct DesktopApp: App {
             EmptyView()
         }
         Window("Sign In", id: Windows.login.rawValue) {
-            LoginForm<PreviewSession>()
-        }.environmentObject(appDelegate.session)
-            .windowResizability(.contentSize)
+            LoginForm<SecureSession>()
+                .environmentObject(appDelegate.session)
+                .environmentObject(appDelegate.settings)
+        }
+        .windowResizability(.contentSize)
+        SwiftUI.Settings {
+            SettingsView<CoderVPNService>()
+                .environmentObject(appDelegate.vpn)
+                .environmentObject(appDelegate.settings)
+        }
+        .windowResizability(.contentSize)
     }
 }
 
 @MainActor
 class AppDelegate: NSObject, NSApplicationDelegate {
     private var menuBarExtra: FluidMenuBarExtra?
     let vpn: CoderVPNService
-    let session: PreviewSession
+    let session: SecureSession
+    let settings: Settings
 
     override init() {
         vpn = CoderVPNService()
-        // TODO: Replace with real implementations
-        session = PreviewSession()
+        settings = Settings()
+        session = SecureSession(onChange: vpn.configureTunnelProviderProtocol)
     }
 
     func applicationDidFinishLaunching(_: Notification) {
         menuBarExtra = FluidMenuBarExtra(title: "Coder Desktop", image: "MenuBarIcon") {
-            VPNMenu<CoderVPNService, PreviewSession>().frame(width: 256)
+            VPNMenu<CoderVPNService, SecureSession>().frame(width: 256)
                 .environmentObject(self.vpn)
                 .environmentObject(self.session)
+                .environmentObject(self.settings)
         }
     }
 
@@ -49,3 +59,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         false
     }
 }
+
+@MainActor
+func appActivate() {
+    NSApp.activate()
+}

Coder Desktop/Coder Desktop/Coder_DesktopApp.swift

@@ -3,17 +3,17 @@ import os
 
 enum NetworkExtensionState: Equatable {
     case unconfigured
-    case disbled
+    case disabled
     case enabled
     case failed(String)
 
     var description: String {
         switch self {
         case .unconfigured:
-            return "Not logged in to Coder"
+            return "NetworkExtension not configured, try logging in again"
         case .enabled:
             return "NetworkExtension tunnel enabled"
-        case .disbled:
+        case .disabled:
             return "NetworkExtension tunnel disabled"
         case let .failed(error):
             return "NetworkExtension config failed: \(error)"
@@ -24,6 +24,16 @@ enum NetworkExtensionState: Equatable {
 /// An actor that handles configuring, enabling, and disabling the VPN tunnel via the
 /// NetworkExtension APIs.
 extension CoderVPNService {
+    // Updates the UI if a previous configuration exists
+    func loadNetworkExtension() async {
+        do {
+            try await getTunnelManager()
+            neState = .disabled
+        } catch {
+            neState = .unconfigured
+        }
+    }
+
     func configureNetworkExtension(proto: NETunnelProviderProtocol) async {
         // removing the old tunnels, rather than reconfiguring ensures that configuration changes
         // are picked up.
@@ -47,6 +57,7 @@ extension CoderVPNService {
             logger.error("save tunnel failed: \(error)")
             neState = .failed(error.localizedDescription)
         }
+        neState = .disabled
     }
 
     func removeNetworkExtension() async throws(VPNServiceError) {
@@ -91,9 +102,10 @@ extension CoderVPNService {
             return
         }
         logger.debug("saved tunnel with enabled=false")
-        neState = .disbled
+        neState = .disabled
     }
 
+    @discardableResult
     private func getTunnelManager() async throws(VPNServiceError) -> NETunnelProviderManager {
         var tunnels: [NETunnelProviderManager] = []
         do {

Coder Desktop/Coder Desktop/NetworkExtension.swift

@@ -1,6 +1,8 @@
+import CoderSDK
 import Foundation
 import KeychainAccess
 import NetworkExtension
+import SwiftUI
 
 protocol Session: ObservableObject {
     var hasSession: Bool { get }
@@ -89,3 +91,47 @@ class SecureSession: ObservableObject, Session {
         static let sessionToken = "sessionToken"
     }
 }
+
+class Settings: ObservableObject {
+    private let store: UserDefaults
+    @AppStorage(Keys.useLiteralHeaders) var useLiteralHeaders = false
+
+    @Published var literalHeaders: [LiteralHeader] {
+        didSet {
+            try? store.set(JSONEncoder().encode(literalHeaders), forKey: Keys.literalHeaders)
+        }
+    }
+
+    init(store: UserDefaults = .standard) {
+        self.store = store
+        _literalHeaders = Published(
+            initialValue: store.data(
+                forKey: Keys.literalHeaders
+            ).flatMap { try? JSONDecoder().decode([LiteralHeader].self, from: $0) } ?? []
+        )
+    }
+
+    enum Keys {
+        static let useLiteralHeaders = "UseLiteralHeaders"
+        static let literalHeaders = "LiteralHeaders"
+    }
+}
+
+struct LiteralHeader: Hashable, Identifiable, Equatable, Codable {
+    var header: String
+    var value: String
+    var id: String {
+        "\(header):\(value)"
+    }
+
+    init(header: String, value: String) {
+        self.header = header
+        self.value = value
+    }
+}
+
+extension LiteralHeader {
+    func toSDKHeader() -> HTTPHeader {
+        return .init(header: header, value: value)
+    }
+}

Coder Desktop/Coder Desktop/Session.swift renamed to Coder Desktop/Coder Desktop/State.swift

@@ -52,7 +52,7 @@ final class CoderVPNService: NSObject, VPNService {
         guard sysExtnState == .installed else {
             return .failed(.systemExtensionError(sysExtnState))
         }
-        guard neState == .enabled || neState == .disbled else {
+        guard neState == .enabled || neState == .disabled else {
             return .failed(.networkExtensionError(neState))
         }
         return tunnelState
@@ -72,6 +72,9 @@ final class CoderVPNService: NSObject, VPNService {
 
         super.init()
         installSystemExtension()
+        Task {
+            await loadNetworkExtension()
+        }
     }
 
     var startTask: Task<Void, Never>?