chore: add dylib downloader and validator (#16)

First PR for #2.

This PR adds an abstraction for downloading & validating the dylib from a Coder server, and the network extension scaffolding.

It also adds a `TunnelHandle` type for owning the pair of pipes passed to the dylib, and the handle to the dylib itself.

You cannot create a unit test target that targets a System Extension. So, this PR extracts the portion of the network extension that we'd like to test into it's own Framework, `VPNLib`.

Of note is that `SwiftProtobuf` doesn't have a stable ABI (as it doesn't use [library evolution](https://www.swift.org/blog/library-evolution/)), so the Framework has the `Build libraries for distribution` setting disabled. This shouldn't effect anything. Exporting the `SwiftProtobuf` types should be fine provided we don't import `SwiftProtobuf` in to the `VPN` target as well.

Author: ethanndickson

Coder Desktop/Coder Desktop.xcodeproj/project.pbxproj

@@ -62,9 +62,20 @@
             parallelizable = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "961679D82D030E1D00B2B6DF"
-               BuildableName = "ProtoTests.xctest"
-               BlueprintName = "ProtoTests"
+               BlueprintIdentifier = "AA3B3DA02D2D23860099996A"
+               BuildableName = "VPNLib.framework"
+               BlueprintName = "VPNLib"
+               ReferencedContainer = "container:Coder Desktop.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AA3B3DA72D2D23860099996A"
+               BuildableName = "VPNLibTests.xctest"
+               BlueprintName = "VPNLibTests"
                ReferencedContainer = "container:Coder Desktop.xcodeproj">
             </BuildableReference>
          </TestableReference>

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

@@ -6,26 +6,29 @@
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES"
       buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9616792F2CFF117300B2B6DF"
+               BuildableName = "com.coder.Coder-Desktop.VPN.systemextension"
+               BlueprintName = "VPN"
+               ReferencedContainer = "container:Coder Desktop.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       shouldAutocreateTestPlan = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "961679D82D030E1D00B2B6DF"
-               BuildableName = "ProtoTests.xctest"
-               BlueprintName = "ProtoTests"
-               ReferencedContainer = "container:Coder Desktop.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -37,16 +40,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "961678FB2CFF100D00B2B6DF"
-            BuildableName = "Coder Desktop.app"
-            BlueprintName = "Coder Desktop"
-            ReferencedContainer = "container:Coder Desktop.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -57,9 +50,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "961678FB2CFF100D00B2B6DF"
-            BuildableName = "Coder Desktop.app"
-            BlueprintName = "Coder Desktop"
+            BlueprintIdentifier = "9616792F2CFF117300B2B6DF"
+            BuildableName = "com.coder.Coder-Desktop.VPN.systemextension"
+            BlueprintName = "VPN"
             ReferencedContainer = "container:Coder Desktop.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

Coder Desktop/Coder Desktop.xcodeproj/xcshareddata/xcschemes/Coder Desktop.xcscheme

@@ -19,15 +19,15 @@
     {
       "target" : {
         "containerPath" : "container:Coder Desktop.xcodeproj",
-        "identifier" : "961679D82D030E1D00B2B6DF",
-        "name" : "ProtoTests"
+        "identifier" : "9616790E2CFF100E00B2B6DF",
+        "name" : "Coder DesktopTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Coder Desktop.xcodeproj",
-        "identifier" : "9616790E2CFF100E00B2B6DF",
-        "name" : "Coder DesktopTests"
+        "identifier" : "AA3B3DA72D2D23860099996A",
+        "name" : "VPNLibTests"
       }
     },
     {

Coder Desktop/Coder Desktop.xcodeproj/xcshareddata/xcschemes/ProtoTests.xcscheme renamed to Coder Desktop/Coder Desktop.xcodeproj/xcshareddata/xcschemes/VPN.xcscheme

@@ -1,7 +1,7 @@
 import Alamofire
 import Foundation
 
-protocol Client {
+protocol Client: Sendable {
     init(url: URL, token: String?)
     func user(_ ident: String) async throws(ClientError) -> User
 }
@@ -114,10 +114,10 @@ struct APIError: Decodable {
 struct Response: Decodable {
     let message: String
     let detail: String?
-    let validations: [ValidationError]?
+    let validations: [FieldValidation]?
 }
 
-struct ValidationError: Decodable {
+struct FieldValidation: Decodable {
     let field: String
     let detail: String
 }

Coder Desktop/Coder Desktop.xctestplan

@@ -0,0 +1,19 @@
+import NetworkExtension
+import os
+import VPNLib
+
+actor Manager {
+    let ptp: PacketTunnelProvider
+
+    var tunnelHandle: TunnelHandle?
+    var speaker: Speaker<Vpn_ManagerMessage, Vpn_TunnelMessage>?
+    // TODO: XPC Speaker
+
+    private let dest = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)
+        .first!.appending(path: "coder-vpn.dylib")
+    private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "manager")
+
+    init(with: PacketTunnelProvider) {
+        ptp = with
+    }
+}

Coder Desktop/Coder Desktop/SDK/Client.swift

@@ -1,12 +1,62 @@
 import NetworkExtension
+import os
 
-class PacketTunnelProvider: NEPacketTunnelProvider {
-    override func startTunnel(options _: [String: NSObject]?, completionHandler _: @escaping (Error?) -> Void) {
-        // Add code here to start the process of connecting the tunnel.
+/* From <sys/kern_control.h> */
+let CTLIOCGINFO: UInt = 0xC064_4E03
+
+class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable {
+    private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "network-extension")
+    private var manager: Manager?
+
+    private var tunnelFileDescriptor: Int32? {
+        var ctlInfo = ctl_info()
+        withUnsafeMutablePointer(to: &ctlInfo.ctl_name) {
+            $0.withMemoryRebound(to: CChar.self, capacity: MemoryLayout.size(ofValue: $0.pointee)) {
+                _ = strcpy($0, "com.apple.net.utun_control")
+            }
+        }
+        for fd: Int32 in 0 ... 1024 {
+            var addr = sockaddr_ctl()
+            var ret: Int32 = -1
+            var len = socklen_t(MemoryLayout.size(ofValue: addr))
+            withUnsafeMutablePointer(to: &addr) {
+                $0.withMemoryRebound(to: sockaddr.self, capacity: 1) {
+                    ret = getpeername(fd, $0, &len)
+                }
+            }
+            if ret != 0 || addr.sc_family != AF_SYSTEM {
+                continue
+            }
+            if ctlInfo.ctl_id == 0 {
+                ret = ioctl(fd, CTLIOCGINFO, &ctlInfo)
+                if ret != 0 {
+                    continue
+                }
+            }
+            if addr.sc_id == ctlInfo.ctl_id {
+                return fd
+            }
+        }
+        return nil
+    }
+
+    override func startTunnel(options _: [String: NSObject]?, completionHandler: @escaping (Error?) -> Void) {
+        guard manager == nil else {
+            logger.error("startTunnel called with non-nil Manager")
+            completionHandler(nil)
+            return
+        }
+        manager = Manager(with: self)
+        completionHandler(nil)
     }
 
     override func stopTunnel(with _: NEProviderStopReason, completionHandler: @escaping () -> Void) {
-        // Add code here to start the process of stopping the tunnel.
+        guard manager == nil else {
+            logger.error("stopTunnel called with nil Manager")
+            completionHandler()
+            return
+        }
+        manager = nil
         completionHandler()
     }
 

Coder Desktop/VPN/Manager.swift

@@ -0,0 +1,91 @@
+import Foundation
+import os
+
+let startSymbol = "OpenTunnel"
+
+actor TunnelHandle {
+    private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "tunnel-handle")
+
+    private let tunnelWritePipe: Pipe
+    private let tunnelReadPipe: Pipe
+    private let dylibHandle: UnsafeMutableRawPointer
+
+    var writeHandle: FileHandle { tunnelReadPipe.fileHandleForWriting }
+    var readHandle: FileHandle { tunnelWritePipe.fileHandleForReading }
+
+    init(dylibPath: URL) throws(TunnelHandleError) {
+        guard let dylibHandle = dlopen(dylibPath.path, RTLD_NOW | RTLD_LOCAL) else {
+            throw .dylib(dlerror().flatMap { String(cString: $0) } ?? "UNKNOWN")
+        }
+        self.dylibHandle = dylibHandle
+
+        guard let startSym = dlsym(dylibHandle, startSymbol) else {
+            throw .symbol(startSymbol, dlerror().flatMap { String(cString: $0) } ?? "UNKNOWN")
+        }
+        let openTunnelFn = unsafeBitCast(startSym, to: OpenTunnel.self)
+        tunnelReadPipe = Pipe()
+        tunnelWritePipe = Pipe()
+        let res = openTunnelFn(tunnelReadPipe.fileHandleForReading.fileDescriptor,
+                               tunnelWritePipe.fileHandleForWriting.fileDescriptor)
+        guard res == 0 else {
+            throw .openTunnel(OpenTunnelError(rawValue: res) ?? .unknown)
+        }
+    }
+
+    // This could be an isolated deinit in Swift 6.1
+    func close() throws(TunnelHandleError) {
+        var errs: [Error] = []
+        if dlclose(dylibHandle) == 0 {
+            errs.append(TunnelHandleError.dylib(dlerror().flatMap { String(cString: $0) } ?? "UNKNOWN"))
+        }
+        do {
+            try writeHandle.close()
+        } catch {
+            errs.append(error)
+        }
+        do {
+            try readHandle.close()
+        } catch {
+            errs.append(error)
+        }
+        if !errs.isEmpty {
+            throw .close(errs)
+        }
+    }
+}
+
+enum TunnelHandleError: Error {
+    case dylib(String)
+    case symbol(String, String)
+    case openTunnel(OpenTunnelError)
+    case pipe(any Error)
+    case close([any Error])
+
+    var description: String {
+        switch self {
+        case let .pipe(err): return "pipe error: \(err)"
+        case let .dylib(d): return d
+        case let .symbol(symbol, message): return "\(symbol): \(message)"
+        case let .openTunnel(error): return "OpenTunnel: \(error.message)"
+        case let .close(errs): return "close tunnel: \(errs.map(\.localizedDescription).joined(separator: ", "))"
+        }
+    }
+}
+
+enum OpenTunnelError: Int32 {
+    case errDupReadFD = -2
+    case errDupWriteFD = -3
+    case errOpenPipe = -4
+    case errNewTunnel = -5
+    case unknown = -99
+
+    var message: String {
+        switch self {
+        case .errDupReadFD: return "Failed to duplicate read file descriptor"
+        case .errDupWriteFD: return "Failed to duplicate write file descriptor"
+        case .errOpenPipe: return "Failed to open the pipe"
+        case .errNewTunnel: return "Failed to create a new tunnel"
+        case .unknown: return "Unknown error code"
+        }
+    }
+}

Coder Desktop/VPN/PacketTunnelProvider.swift

@@ -0,0 +1,7 @@
+#ifndef CoderPacketTunnelProvider_Bridging_Header_h
+#define CoderPacketTunnelProvider_Bridging_Header_h
+
+// GoInt32 OpenTunnel(GoInt32 cReadFD, GoInt32 cWriteFD);
+typedef int(*OpenTunnel)(int, int);
+
+#endif /* CoderPacketTunnelProvider_Bridging_Header_h */

Coder Desktop/VPN/TunnelHandle.swift

@@ -0,0 +1,171 @@
+import CryptoKit
+import Foundation
+
+public enum ValidationError: Error {
+    case fileNotFound
+    case unableToCreateStaticCode
+    case invalidSignature
+    case unableToRetrieveInfo
+    case invalidIdentifier(identifier: String?)
+    case invalidTeamIdentifier(identifier: String?)
+    case missingInfoPList
+    case invalidVersion(version: String?)
+
+    public var errorDescription: String? {
+        switch self {
+        case .fileNotFound:
+            return "The file does not exist."
+        case .unableToCreateStaticCode:
+            return "Unable to create a static code object."
+        case .invalidSignature:
+            return "The file's signature is invalid."
+        case .unableToRetrieveInfo:
+            return "Unable to retrieve signing information."
+        case let .invalidIdentifier(identifier):
+            return "Invalid identifier: \(identifier ?? "unknown")."
+        case let .invalidVersion(version):
+            return "Invalid runtime version: \(version ?? "unknown")."
+        case let .invalidTeamIdentifier(identifier):
+            return "Invalid team identifier: \(identifier ?? "unknown")."
+        case .missingInfoPList:
+            return "Info.plist is not embedded within the dylib."
+        }
+    }
+}
+
+public class SignatureValidator {
+    private static let expectedName = "CoderVPN"
+    private static let expectedIdentifier = "com.coder.Coder-Desktop.VPN.dylib"
+    private static let expectedTeamIdentifier = "4399GN35BJ"
+    private static let minDylibVersion = "2.18.1"
+
+    private static let infoIdentifierKey = "CFBundleIdentifier"
+    private static let infoNameKey = "CFBundleName"
+    private static let infoShortVersionKey = "CFBundleShortVersionString"
+
+    private static let signInfoFlags: SecCSFlags = .init(rawValue: kSecCSSigningInformation)
+
+    public static func validate(path: URL) throws(ValidationError) {
+        guard FileManager.default.fileExists(atPath: path.path) else {
+            throw .fileNotFound
+        }
+
+        var staticCode: SecStaticCode?
+        let status = SecStaticCodeCreateWithPath(path as CFURL, SecCSFlags(), &staticCode)
+        guard status == errSecSuccess, let code = staticCode else {
+            throw .unableToCreateStaticCode
+        }
+
+        let validateStatus = SecStaticCodeCheckValidity(code, SecCSFlags(), nil)
+        guard validateStatus == errSecSuccess else {
+            throw .invalidSignature
+        }
+
+        var information: CFDictionary?
+        let infoStatus = SecCodeCopySigningInformation(code, signInfoFlags, &information)
+        guard infoStatus == errSecSuccess, let info = information as? [String: Any] else {
+            throw .unableToRetrieveInfo
+        }
+
+        guard let identifier = info[kSecCodeInfoIdentifier as String] as? String,
+              identifier == expectedIdentifier
+        else {
+            throw .invalidIdentifier(identifier: info[kSecCodeInfoIdentifier as String] as? String)
+        }
+
+        guard let teamIdentifier = info[kSecCodeInfoTeamIdentifier as String] as? String,
+              teamIdentifier == expectedTeamIdentifier
+        else {
+            throw .invalidTeamIdentifier(
+                identifier: info[kSecCodeInfoTeamIdentifier as String] as? String
+            )
+        }
+
+        guard let infoPlist = info[kSecCodeInfoPList as String] as? [String: AnyObject] else {
+            throw .missingInfoPList
+        }
+
+        guard let plistIdent = infoPlist[infoIdentifierKey] as? String, plistIdent == expectedIdentifier else {
+            throw .invalidIdentifier(identifier: infoPlist[infoIdentifierKey] as? String)
+        }
+
+        guard let plistName = infoPlist[infoNameKey] as? String, plistName == expectedName else {
+            throw .invalidIdentifier(identifier: infoPlist[infoNameKey] as? String)
+        }
+
+        guard let dylibVersion = infoPlist[infoShortVersionKey] as? String,
+              minDylibVersion.compare(dylibVersion, options: .numeric) != .orderedDescending
+        else {
+            throw .invalidVersion(version: infoPlist[infoShortVersionKey] as? String)
+        }
+    }
+}
+
+public func download(src: URL, dest: URL) async throws(DownloadError) {
+    var req = URLRequest(url: src)
+    if FileManager.default.fileExists(atPath: dest.path) {
+        if let existingFileData = try? Data(contentsOf: dest, options: .mappedIfSafe) {
+            req.setValue(etag(data: existingFileData), forHTTPHeaderField: "If-None-Match")
+        }
+    }
+    // TODO: Add Content-Length headers to coderd, add download progress delegate
+    let tempURL: URL
+    let response: URLResponse
+    do {
+        (tempURL, response) = try await URLSession.shared.download(for: req)
+    } catch {
+        throw .networkError(error)
+    }
+    defer {
+        if FileManager.default.fileExists(atPath: tempURL.path) {
+            try? FileManager.default.removeItem(at: tempURL)
+        }
+    }
+
+    guard let httpResponse = response as? HTTPURLResponse else {
+        throw .invalidResponse
+    }
+    guard httpResponse.statusCode != 304 else {
+        // We already have the latest dylib downloaded on disk
+        return
+    }
+
+    guard httpResponse.statusCode == 200 else {
+        throw .unexpectedStatusCode(httpResponse.statusCode)
+    }
+
+    do {
+        if FileManager.default.fileExists(atPath: dest.path) {
+            try FileManager.default.removeItem(at: dest)
+        }
+        try FileManager.default.moveItem(at: tempURL, to: dest)
+    } catch {
+        throw .fileOpError(error)
+    }
+}
+
+func etag(data: Data) -> String {
+    let sha1Hash = Insecure.SHA1.hash(data: data)
+    let etag = sha1Hash.map { String(format: "%02x", $0) }.joined()
+    return "\"\(etag)\""
+}
+
+public enum DownloadError: Error {
+    case unexpectedStatusCode(Int)
+    case invalidResponse
+    case networkError(any Error)
+    case fileOpError(any Error)
+
+    var localizedDescription: String {
+        switch self {
+        case let .unexpectedStatusCode(code):
+            return "Unexpected HTTP status code: \(code)"
+        case let .networkError(error):
+            return "Network error: \(error.localizedDescription)"
+        case let .fileOpError(error):
+            return "File operation error: \(error.localizedDescription)"
+        case .invalidResponse:
+            return "Received non-HTTP response"
+        }
+    }
+}

Coder Desktop/VPN/com_coder_Coder_Desktop_VPN-Bridging-Header.h

@@ -7,7 +7,7 @@ actor Receiver<RecvMsg: Message> {
     private let dispatch: DispatchIO
     private let queue: DispatchQueue
     private var running = false
-    private let logger = Logger(subsystem: "com.coder.Coder-Desktop", category: "proto")
+    private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "proto")
 
     /// Creates an instance using the given `DispatchIO` channel and queue.
     init(dispatch: DispatchIO, queue: DispatchQueue) {

Coder Desktop/VPNLib/Download.swift

@@ -3,7 +3,7 @@ import SwiftProtobuf
 
 /// A actor that serializes and sends VPN protocol messages over a `FileHandle`, which is typically
 /// the write-side of a `Pipe`.
-actor Sender<SendMsg: Message> {
+public actor Sender<SendMsg: Message> {
     private let writeFD: FileHandle
 
     init(writeFD: FileHandle) {

Coder Desktop/Proto/Receiver.swift renamed to Coder Desktop/VPNLib/Receiver.swift

@@ -6,7 +6,7 @@ let newLine = 0x0A
 let headerPreamble = "codervpn"
 
 /// A message that has the `rpc` property for recording participation in a unary RPC.
-protocol RPCMessage: Sendable {
+public protocol RPCMessage: Sendable {
     var rpc: Vpn_RPC { get set }
     /// Returns true if `rpc` has been explicitly set.
     var hasRpc: Bool { get }
@@ -50,8 +50,8 @@ struct ProtoVersion: CustomStringConvertible, Equatable, Codable {
 }
 
 /// An actor that communicates using the VPN protocol
-actor Speaker<SendMsg: RPCMessage & Message, RecvMsg: RPCMessage & Message> {
-    private let logger = Logger(subsystem: "com.coder.Coder-Desktop", category: "proto")
+public actor Speaker<SendMsg: RPCMessage & Message, RecvMsg: RPCMessage & Message> {
+    private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "proto")
     private let writeFD: FileHandle
     private let readFD: FileHandle
     private let dispatch: DispatchIO
@@ -62,7 +62,7 @@ actor Speaker<SendMsg: RPCMessage & Message, RecvMsg: RPCMessage & Message> {
     let role: ProtoRole
 
     /// Creates an instance that communicates over the provided file handles.
-    init(writeFD: FileHandle, readFD: FileHandle) {
+    public init(writeFD: FileHandle, readFD: FileHandle) {
         self.writeFD = writeFD
         self.readFD = readFD
         sender = Sender(writeFD: writeFD)
@@ -130,20 +130,20 @@ actor Speaker<SendMsg: RPCMessage & Message, RecvMsg: RPCMessage & Message> {
         }
     }
 
-    enum IncomingMessage {
+    public enum IncomingMessage: Sendable {
         case message(RecvMsg)
         case RPC(RPCRequest<SendMsg, RecvMsg>)
     }
 }
 
 extension Speaker: AsyncSequence, AsyncIteratorProtocol {
-    typealias Element = IncomingMessage
+    public typealias Element = IncomingMessage
 
     public nonisolated func makeAsyncIterator() -> Speaker<SendMsg, RecvMsg> {
         self
     }
 
-    func next() async throws -> IncomingMessage? {
+    public func next() async throws -> IncomingMessage? {
         for try await msg in try await receiver.messages() {
             guard msg.hasRpc else {
                 return .message(msg)
@@ -277,7 +277,7 @@ enum HandshakeError: Error {
     case unsupportedVersion([ProtoVersion])
 }
 
-struct RPCRequest<SendMsg: RPCMessage & Message, RecvMsg: RPCMessage & Sendable>: Sendable {
+public struct RPCRequest<SendMsg: RPCMessage & Message, RecvMsg: RPCMessage & Sendable>: Sendable {
     let msg: RecvMsg
     private let sender: Sender<SendMsg>
 

Coder Desktop/Proto/Sender.swift renamed to Coder Desktop/VPNLib/Sender.swift

@@ -0,0 +1,11 @@
+#import <Foundation/Foundation.h>
+
+//! Project version number for VPNLib.
+FOUNDATION_EXPORT double VPNLibVersionNumber;
+
+//! Project version string for VPNLib.
+FOUNDATION_EXPORT const unsigned char VPNLibVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <VPNLib/PublicHeader.h>
+
+

Coder Desktop/Proto/Speaker.swift renamed to Coder Desktop/VPNLib/Speaker.swift

@@ -0,0 +1,81 @@
+import Foundation
+import Mocker
+import Testing
+@testable import VPNLib
+
+@Suite(.timeLimit(.minutes(1)))
+struct DownloadTests {
+    @Test
+    func downloadFile() async throws {
+        let destinationURL = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
+        let testData = Data("foo".utf8)
+
+        let fileURL = URL(string: "http://example.com/test1.txt")!
+        Mock(url: fileURL, contentType: .html, statusCode: 200, data: [.get: testData]).register()
+
+        try await download(src: fileURL, dest: destinationURL)
+
+        try #require(FileManager.default.fileExists(atPath: destinationURL.path))
+        defer { try? FileManager.default.removeItem(at: destinationURL) }
+
+        let downloadedData = try Data(contentsOf: destinationURL)
+        #expect(downloadedData == testData)
+    }
+
+    @Test
+    func fileNotModified() async throws {
+        let testData = Data("foo bar".utf8)
+        let fileURL = URL(string: "http://example.com/test2.txt")!
+
+        let destinationURL = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
+        defer { try? FileManager.default.removeItem(at: destinationURL) }
+
+        Mock(url: fileURL, contentType: .html, statusCode: 200, data: [.get: testData]).register()
+
+        try await download(src: fileURL, dest: destinationURL)
+        try #require(FileManager.default.fileExists(atPath: destinationURL.path))
+        let downloadedData = try Data(contentsOf: destinationURL)
+        #expect(downloadedData == testData)
+
+        var mock = Mock(url: fileURL, contentType: .html, statusCode: 304, data: [.get: Data()])
+        var etagIncluded = false
+        mock.onRequestHandler = OnRequestHandler { request in
+            etagIncluded = request.value(forHTTPHeaderField: "If-None-Match") == etag(data: testData)
+        }
+        mock.register()
+
+        try await download(src: fileURL, dest: destinationURL)
+        let unchangedData = try Data(contentsOf: destinationURL)
+        #expect(unchangedData == testData)
+        #expect(etagIncluded)
+    }
+
+    @Test
+    func fileUpdated() async throws {
+        let ogData = Data("foo bar".utf8)
+        let newData = Data("foo bar qux".utf8)
+
+        let fileURL = URL(string: "http://example.com/test3.txt")!
+        let destinationURL = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
+        defer { try? FileManager.default.removeItem(at: destinationURL) }
+
+        Mock(url: fileURL, contentType: .html, statusCode: 200, data: [.get: ogData]).register()
+
+        try await download(src: fileURL, dest: destinationURL)
+        try #require(FileManager.default.fileExists(atPath: destinationURL.path))
+        var downloadedData = try Data(contentsOf: destinationURL)
+        #expect(downloadedData == ogData)
+
+        var mock = Mock(url: fileURL, contentType: .html, statusCode: 200, data: [.get: newData])
+        var etagIncluded = false
+        mock.onRequestHandler = OnRequestHandler { request in
+            etagIncluded = request.value(forHTTPHeaderField: "If-None-Match") == etag(data: ogData)
+        }
+        mock.register()
+
+        try await download(src: fileURL, dest: destinationURL)
+        downloadedData = try Data(contentsOf: destinationURL)
+        #expect(downloadedData == newData)
+        #expect(etagIncluded)
+    }
+}

Coder Desktop/VPNLib/VPNLib.h

@@ -1,6 +1,6 @@
-@testable import Coder_Desktop
 import Foundation
 import Testing
+@testable import VPNLib
 
 @Suite(.timeLimit(.minutes(1)))
 struct SenderReceiverTests {

Coder Desktop/Proto/vpn.pb.swift renamed to Coder Desktop/VPNLib/vpn.pb.swift

@@ -1,6 +1,6 @@
-@testable import Coder_Desktop
 import Foundation
 import Testing
+@testable import VPNLib
 
 @Suite(.timeLimit(.minutes(1)))
 struct SpeakerTests: Sendable {

Coder Desktop/Proto/vpn.proto renamed to Coder Desktop/VPNLib/vpn.proto

@@ -34,4 +34,4 @@ clean:
 		-project $(PROJECT)
 
 proto:
-	protoc --swift_out=. 'Coder Desktop/Proto/vpn.proto'
+	protoc --swift_opt=Visibility=public --swift_out=. 'Coder Desktop/VPNLib/vpn.proto'