Skip to content

Commit 9d2634e

Browse files
only21milclaudemaria-rcks
authored
fix(desktop): read the Chrome cookie key off the main thread on macOS (#23157)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
1 parent 3331b93 commit 9d2634e

2 files changed

Lines changed: 21 additions & 8 deletions

File tree

‎apps/desktop/src/preview/BrowserImport/ChromiumKeys.test.ts‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,17 @@ import {
1919
import { LinuxBrowserSecretPath } from "./LinuxBrowserSecret.ts";
2020
import { BROWSER_IMPORT_SOURCES } from "./Sources.ts";
2121

22-
const { getPassword } = vi.hoisted(() => ({ getPassword: vi.fn<() => string | null>() }));
22+
const { getPassword } = vi.hoisted(() => ({
23+
getPassword: vi.fn<() => Promise<string | undefined>>(),
24+
}));
2325

2426
vi.mock("@napi-rs/keyring", () => ({
2527
Entry: class {
28+
getPassword() {
29+
throw new Error("synchronous keychain read");
30+
}
31+
},
32+
AsyncEntry: class {
2633
getPassword = getPassword;
2734
},
2835
}));
@@ -91,18 +98,24 @@ describe("macOS Chromium secrets", () => {
9198

9299
it.effect("derives the cookie key from the keychain secret", () =>
93100
Effect.gen(function* () {
94-
getPassword.mockReturnValue("macos-secret");
101+
getPassword.mockResolvedValue("macos-secret");
95102
const keys = yield* resolveChromiumKeys(request);
96103
expect(keys.cbcV10?.toString("hex")).toBe("3df7306fb1eac353289565a2f6b64f74");
97104
}).pipe(Effect.provide(layerNoProcesses)),
98105
);
99106

107+
it.effect("reports a keychain entry the async read resolves as undefined", () =>
108+
Effect.gen(function* () {
109+
getPassword.mockResolvedValue(undefined);
110+
const error = yield* resolveChromiumKeys(request).pipe(Effect.flip);
111+
expect(error.reason).toBe("keychainItemMissing");
112+
}).pipe(Effect.provide(layerNoProcesses)),
113+
);
114+
100115
it.effect("preserves a denied keychain approval", () =>
101116
Effect.gen(function* () {
102117
const denied = new Error("User denied access");
103-
getPassword.mockImplementation(() => {
104-
throw denied;
105-
});
118+
getPassword.mockRejectedValue(denied);
106119
const error = yield* resolveChromiumKeys(request).pipe(Effect.flip);
107120
expect(error.reason).toBe("needsKeychainApproval");
108121
expect(error.cause).toBe(denied);

‎apps/desktop/src/preview/BrowserImport/ChromiumKeys.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ const readKeychainSecret = Effect.fn("ChromiumKeys.readKeychainSecret")(function
5959
try: () => import("@napi-rs/keyring"),
6060
catch: (cause) => new ChromiumKeyError({ reason: "keychainUnavailable", cause }),
6161
});
62-
const secret = yield* Effect.try({
63-
try: () => new Keyring.Entry(service, account).getPassword(),
62+
const secret = yield* Effect.tryPromise({
63+
try: () => new Keyring.AsyncEntry(service, account).getPassword(),
6464
catch: (cause) => {
6565
const message = String((cause as { message?: unknown } | undefined)?.message ?? "");
6666
const missing = /no (matching )?entry|not found/i.test(message);
@@ -70,7 +70,7 @@ const readKeychainSecret = Effect.fn("ChromiumKeys.readKeychainSecret")(function
7070
});
7171
},
7272
});
73-
if (secret === null || secret === "") {
73+
if (!secret) {
7474
return yield* new ChromiumKeyError({ reason: "keychainItemMissing" });
7575
}
7676
return secret;

0 commit comments

Comments
 (0)