Merge pull request #43 from gertrude-app/replace-nullbytes

gertrude-app · Sep 22, 2023 · f228faf · f228faf
2 parents 01495b9 + e4c5bc8
commit f228faf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/api/Sources/Api/PairQL/MacApp/Resolvers/CreateKeystrokeLines.swift b/api/Sources/Api/PairQL/MacApp/Resolvers/CreateKeystrokeLines.swift
@@ -10,7 +10,7 @@ extension CreateKeystrokeLines: Resolver {
       KeystrokeLine(
         userDeviceId: userDevice.id,
         appName: input.appName,
-        line: input.line,
+        line: input.line.replacingOccurrences(of: "\0", with: "\u{FFFD}"),
         filterSuspended: input.filterSuspended ?? false,
         createdAt: input.time
       )

diff --git a/api/Tests/ApiTests/MacappPairResolvers/MacAppResolverTests.swift b/api/Tests/ApiTests/MacappPairResolvers/MacAppResolverTests.swift
@@ -63,6 +63,25 @@ final class MacAppResolverTests: ApiTestCase {
     expect(inserted.createdAt).toEqual(.epoch)
   }
 
+  func testInsertKeystrokeLineWithNullByte() async throws {
+    let user = try await Entities.user().withDevice()
+    let (uuid, _) = mockUUIDs()
+
+    let output = try await CreateKeystrokeLines.resolve(
+      with: [.init(
+        appName: "Xcode",
+        line: "Hello\0World", // <-- causes postgres to choke
+        filterSuspended: false,
+        time: .epoch
+      )],
+      in: context(user)
+    )
+
+    expect(output).toEqual(.success)
+    let inserted = try await Current.db.find(KeystrokeLine.Id(uuid))
+    expect(inserted.line).toEqual("Hello�World")
+  }
+
   func testCreateUnlockRequests_v2() async throws {
     let user = try await Entities.user().withDevice()
     let blocked = CreateUnlockRequests_v2.Input.BlockedRequest(