AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.
HTML ai-agentcloudflarecloudflare-d1cloudflare-r2cloudflare-workersdockerelectronevernoteevernote-alternativeknowledge-basemcpnote-takingobsidian-alternativeoffline-firstpersonal-knowledge-basepwaself-hostedsqlitetiptapweb-clipper
fix(desktop): authenticate resource fetches
tianma-if928f704a6741
diff --git a/apps/desktop/src/main/index.mjs b/apps/desktop/src/main/index.mjsindex c834106a..e0dce50e 100644--- a/apps/desktop/src/main/index.mjs+++ b/apps/desktop/src/main/index.mjs@@ -5,6 +5,7 @@ import { basename, join } from "node:path";import { execFile, spawn } from "node:child_process";import { fileURLToPath } from "node:url";import { SidecarRpcClient } from "./rpc.mjs";+import { resourceRequestHeaders } from "./resource-request.mjs";import { isSafeResourceId, resourceIdFromRequest } from "./resource-url.mjs";import { isSupportedAssociatedFile } from "./file-association.mjs";import { accountDataDirectory, accountScopeKey } from "./account-scope.mjs";@@ -359,8 +360,8 @@ const registerResourceProtocol = () => {const sourceUrl = `${configuredApiBaseUrl}/api/v1/resources/${encodeURIComponent(resourceId)}/blob`;try {const cookies = await session.defaultSession.cookies.get({ url: sourceUrl });- const cookieHeader = cookies.map((cookie) => `${cookie.name}=${cookie.value}`).join("; ");- const response = await net.fetch(sourceUrl, cookieHeader ? { headers: { Cookie: cookieHeader } } : undefined);+ const headers = resourceRequestHeaders({ cookies, sessionToken: desktopSessionToken });+ const response = await net.fetch(sourceUrl, { headers });if (!response.ok) return new Response("Resource request failed", { status: response.status });const body = Buffer.from(await response.arrayBuffer());await mkdir(directory, { recursive: true });diff --git a/apps/desktop/src/main/resource-request.mjs b/apps/desktop/src/main/resource-request.mjsnew file mode 100644index 00000000..c1a27dc7--- /dev/null+++ b/apps/desktop/src/main/resource-request.mjs@@ -0,0 +1,10 @@+export const resourceRequestHeaders = ({ cookies = [], sessionToken = "" } = {}) => {+ const headers = new Headers();+ const cookieHeader = cookies.map((cookie) => `${cookie.name}=${cookie.value}`).join("; ");+ const normalizedSessionToken = typeof sessionToken === "string" ? sessionToken.trim() : "";++ if (cookieHeader) headers.set("Cookie", cookieHeader);+ if (normalizedSessionToken) headers.set("Authorization", `Bearer ${normalizedSessionToken}`);++ return headers;+};diff --git a/apps/desktop/src/main/resource-request.test.mjs b/apps/desktop/src/main/resource-request.test.mjsnew file mode 100644index 00000000..cdc93743--- /dev/null+++ b/apps/desktop/src/main/resource-request.test.mjs@@ -0,0 +1,28 @@+import { expect, test } from "bun:test";+import { resourceRequestHeaders } from "./resource-request.mjs";++test("desktop resource requests use the securely stored session token", () => {+ const headers = resourceRequestHeaders({ sessionToken: " session-token " });++ expect(headers.get("Authorization")).toBe("Bearer session-token");+ expect(headers.has("Cookie")).toBe(false);+});++test("desktop resource requests preserve cookies alongside bearer authentication", () => {+ const headers = resourceRequestHeaders({+ cookies: [+ { name: "edgeever_session", value: "cookie-token" },+ { name: "preference", value: "compact" },+ ],+ sessionToken: "session-token",+ });++ expect(headers.get("Cookie")).toBe("edgeever_session=cookie-token; preference=compact");+ expect(headers.get("Authorization")).toBe("Bearer session-token");+});++test("desktop resource requests omit empty authentication headers", () => {+ const headers = resourceRequestHeaders();++ expect([...headers]).toEqual([]);+});diff --git a/package.json b/package.jsonindex 3e77fb5c..d0d907ca 100644--- a/package.json+++ b/package.json@@ -43,7 +43,7 @@"release": "bun scripts/release.mjs","publish:stores": "bun scripts/store-delivery.mjs","test:desktop:sidecar": "bun scripts/test-desktop-sidecar.mjs",- "test:desktop": "bun test apps/desktop/src/main/account-scope.test.mjs apps/desktop/src/main/diagnostic-log.test.mjs apps/desktop/src/main/file-association.test.mjs apps/desktop/src/main/file-permissions.test.mjs apps/desktop/src/main/installation-location.test.mjs apps/desktop/src/main/resource-url.test.mjs apps/desktop/src/main/staged-resource.test.mjs apps/desktop/src/main/tray-icon.test.mjs apps/desktop/src/main/user-data-directory.test.mjs apps/desktop/src/main/window-open-policy.test.mjs apps/desktop/src/main/window-visibility.test.mjs apps/web/src/lib/api.test.mjs apps/web/src/lib/app-page-path.test.mjs apps/web/src/lib/desktop-resources.test.mjs apps/web/src/lib/desktop-sync.test.mjs apps/web/src/lib/local-mirror.test.mjs apps/web/src/lib/repository.test.mjs apps/web/src/lib/runtime.test.mjs apps/web/src/lib/sync-queue.test.mjs && bun run test:desktop:sidecar",+ "test:desktop": "bun test apps/desktop/src/main/account-scope.test.mjs apps/desktop/src/main/diagnostic-log.test.mjs apps/desktop/src/main/file-association.test.mjs apps/desktop/src/main/file-permissions.test.mjs apps/desktop/src/main/installation-location.test.mjs apps/desktop/src/main/resource-request.test.mjs apps/desktop/src/main/resource-url.test.mjs apps/desktop/src/main/staged-resource.test.mjs apps/desktop/src/main/tray-icon.test.mjs apps/desktop/src/main/user-data-directory.test.mjs apps/desktop/src/main/window-open-policy.test.mjs apps/desktop/src/main/window-visibility.test.mjs apps/web/src/lib/api.test.mjs apps/web/src/lib/app-page-path.test.mjs apps/web/src/lib/desktop-resources.test.mjs apps/web/src/lib/desktop-sync.test.mjs apps/web/src/lib/local-mirror.test.mjs apps/web/src/lib/repository.test.mjs apps/web/src/lib/runtime.test.mjs apps/web/src/lib/sync-queue.test.mjs && bun run test:desktop:sidecar","verify:desktop-package": "bun scripts/verify-desktop-package.mjs","build:cloudflare": "bun run typecheck && bun run build","build:site": "bun --cwd apps/site build",