fix: etcd plugin audit fixes, missing features, and comprehensive tests

Author: datlechin

Plugins/EtcdDriverPlugin/EtcdHttpClient.swift

@@ -907,10 +907,10 @@ final class EtcdHttpClient: @unchecked Sendable {
                 SecTrustSetPolicies(serverTrust, policy)
             }
 
-            var secResult: SecTrustResultType = .invalid
-            SecTrustEvaluate(serverTrust, &secResult)
+            var error: CFError?
+            let isValid = SecTrustEvaluateWithError(serverTrust, &error)
 
-            if secResult == .unspecified || secResult == .proceed {
+            if isValid {
                 completionHandler(.useCredential, URLCredential(trust: serverTrust))
             } else {
                 completionHandler(.cancelAuthenticationChallenge, nil)
@@ -944,8 +944,10 @@ final class EtcdHttpClient: @unchecked Sendable {
                 return
             }
 
-            // swiftlint:disable:next force_cast
-            let identity = identityRef as! SecIdentity
+            guard let identity = identityRef as? SecIdentity else {
+                completionHandler(.cancelAuthenticationChallenge, nil)
+                return
+            }
             let credential = URLCredential(
                 identity: identity,
                 certificates: nil,

Plugins/EtcdDriverPlugin/EtcdPluginDriver.swift

@@ -23,7 +23,7 @@ final class EtcdPluginDriver: PluginDatabaseDriver, @unchecked Sendable {
 
     private static let logger = Logger(subsystem: "com.TablePro.EtcdDriver", category: "EtcdPluginDriver")
     private static let maxKeys = PluginRowLimits.defaultMax
-    private static let maxOffset = 10_000
+
 
     private static let columns = ["Key", "Value", "Version", "ModRevision", "CreateRevision", "Lease"]
     private static let columnTypeNames = ["String", "String", "Int64", "Int64", "Int64", "String"]
@@ -34,17 +34,36 @@ final class EtcdPluginDriver: PluginDatabaseDriver, @unchecked Sendable {
 
     var supportsTransactions: Bool { false }
 
+    // etcd has no transaction support — these are no-ops
     func beginTransaction() async throws {}
     func commitTransaction() async throws {}
     func rollbackTransaction() async throws {}
 
     func quoteIdentifier(_ name: String) -> String { name }
 
+    func escapeStringLiteral(_ value: String) -> String { value }
+
     func defaultExportQuery(table: String) -> String? {
         let prefix = resolvedPrefix(for: table)
         return "get \(escapeArgument(prefix)) --prefix"
     }
 
+    func truncateTableStatements(table: String, cascade: Bool) -> [String]? {
+        let prefix = resolvedPrefix(for: table)
+        if prefix.isEmpty {
+            return ["del \"\" --prefix"]
+        }
+        return ["del \(escapeArgument(prefix)) --prefix"]
+    }
+
+    func dropObjectStatement(name: String, type: String) -> String? {
+        let prefix = resolvedPrefix(for: name)
+        if prefix.isEmpty {
+            return "del \"\" --prefix"
+        }
+        return "del \(escapeArgument(prefix)) --prefix"
+    }
+
     init(config: DriverConnectionConfig) {
         self.config = config
         self._rootPrefix = config.additionalFields["etcdKeyPrefix"] ?? config.database
@@ -59,9 +78,8 @@ final class EtcdPluginDriver: PluginDatabaseDriver, @unchecked Sendable {
         let status = try? await client.endpointStatus()
         lock.withLock {
             _serverVersion = status?.version
+            _httpClient = client
         }
-
-        lock.withLock { _httpClient = client }
     }
 
     func disconnect() {
@@ -280,7 +298,7 @@ final class EtcdPluginDriver: PluginDatabaseDriver, @unchecked Sendable {
     }
 
     func fetchViewDefinition(view: String, schema: String?) async throws -> String {
-        ""
+        throw EtcdError.serverError("etcd does not support views")
     }
 
     func fetchTableMetadata(table: String, schema: String?) async throws -> PluginTableMetadata {
@@ -847,11 +865,12 @@ final class EtcdPluginDriver: PluginDatabaseDriver, @unchecked Sendable {
         let response = try await client.rangeRequest(req)
         var kvs = response.kvs ?? []
 
-        // Apply client-side filter if needed
+        // Apply client-side filter if needed (checks both key and value)
         if needsClientFilter {
             kvs = kvs.filter { kv in
                 let key = EtcdHttpClient.base64Decode(kv.key)
-                return matchesFilter(key: key, filterType: filterType, filterValue: filterValue)
+                let value = kv.value.map { EtcdHttpClient.base64Decode($0) }
+                return matchesFilter(key: key, value: value, filterType: filterType, filterValue: filterValue)
             }
         }
 
@@ -881,14 +900,16 @@ final class EtcdPluginDriver: PluginDatabaseDriver, @unchecked Sendable {
             return Int(response.count ?? "0") ?? 0
         }
 
-        // Need to fetch keys and filter client-side
-        let req = EtcdRangeRequest(key: b64Key, rangeEnd: b64RangeEnd, limit: Int64(Self.maxKeys), keysOnly: true)
+        // Need to fetch keys (and values for contains/startsWith filters) and filter client-side
+        let needsValues = filterType == .contains || filterType == .startsWith
+        let req = EtcdRangeRequest(key: b64Key, rangeEnd: b64RangeEnd, limit: Int64(Self.maxKeys), keysOnly: !needsValues)
         let response = try await client.rangeRequest(req)
         let kvs = response.kvs ?? []
 
         return kvs.filter { kv in
             let key = EtcdHttpClient.base64Decode(kv.key)
-            return matchesFilter(key: key, filterType: filterType, filterValue: filterValue)
+            let value = kv.value.map { EtcdHttpClient.base64Decode($0) }
+            return matchesFilter(key: key, value: value, filterType: filterType, filterValue: filterValue)
         }.count
     }
 
@@ -916,7 +937,8 @@ final class EtcdPluginDriver: PluginDatabaseDriver, @unchecked Sendable {
             return table
         }
         let root = _rootPrefix.hasSuffix("/") ? _rootPrefix : _rootPrefix + "/"
-        return root + table
+        let cleanTable = table.hasPrefix("/") ? String(table.dropFirst()) : table
+        return root + cleanTable
     }
 
     private func stripRootPrefix(_ key: String) -> String {
@@ -928,14 +950,21 @@ final class EtcdPluginDriver: PluginDatabaseDriver, @unchecked Sendable {
         return key
     }
 
-    private func matchesFilter(key: String, filterType: EtcdFilterType, filterValue: String) -> Bool {
+    private func matchesFilter(key: String, value: String? = nil, filterType: EtcdFilterType, filterValue: String) -> Bool {
         switch filterType {
         case .none:
             return true
         case .contains:
-            return key.localizedCaseInsensitiveContains(filterValue)
+            if key.localizedCaseInsensitiveContains(filterValue) {
+                return true
+            }
+            return value?.localizedCaseInsensitiveContains(filterValue) ?? false
         case .startsWith:
-            return key.lowercased().hasPrefix(filterValue.lowercased())
+            let lowerFilter = filterValue.lowercased()
+            if key.lowercased().hasPrefix(lowerFilter) {
+                return true
+            }
+            return value?.lowercased().hasPrefix(lowerFilter) ?? false
         case .endsWith:
             return key.lowercased().hasSuffix(filterValue.lowercased())
         case .equals:

Plugins/EtcdDriverPlugin/EtcdStatementGenerator.swift

@@ -74,7 +74,12 @@ struct EtcdStatementGenerator {
         }
 
         // Prepend the current browse prefix if the key doesn't already include it
-        let fullKey = !prefix.isEmpty && !k.hasPrefix(prefix) ? prefix + k : k
+        let fullKey: String
+        if !prefix.isEmpty && !k.hasPrefix("/") {
+            fullKey = prefix + k
+        } else {
+            fullKey = k
+        }
         let v = value ?? ""
         var cmd = "put \(escapeArgument(fullKey)) \(escapeArgument(v))"
         if let lease = leaseId, !lease.isEmpty, lease != "0" {

TableProTests/PluginTestSources/EtcdCommandParser.swift

@@ -0,0 +1 @@
+../../Plugins/EtcdDriverPlugin/EtcdCommandParser.swift

TableProTests/PluginTestSources/EtcdQueryBuilder.swift

@@ -0,0 +1 @@
+../../Plugins/EtcdDriverPlugin/EtcdQueryBuilder.swift

TableProTests/PluginTestSources/EtcdStatementGenerator.swift

@@ -0,0 +1 @@
+../../Plugins/EtcdDriverPlugin/EtcdStatementGenerator.swift