Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

feat(sharing): recover encrypted passwords across devices

tianma-if29bb51125951
diff --git a/apps/api/src/notebook-share-routes.test.mjs b/apps/api/src/notebook-share-routes.test.mjs
index 1b4a8b47..a3efbbef 100644
--- a/apps/api/src/notebook-share-routes.test.mjs
+++ b/apps/api/src/notebook-share-routes.test.mjs
@@ -7,6 +7,7 @@ import {
registerNotebookShareRoutes,
registerPublicNotebookShareRoutes,
} from "./notebook-share-routes";
+import { hashPassword } from "./auth-crypto";
import { registerPublicShareRoutes } from "./share-routes";
const databases = [];
@@ -22,7 +23,7 @@ const auth = {
scopes: [],
username: "test",
};
-const fixture = () => {
+const fixture = (legacyHash) => {
const db = new Database(":memory:");
databases.push(db);
// Populate a real pre-feature schema first, then upgrade it in place.
@@ -75,7 +76,10 @@ const fixture = () => {
[token],
);
db.exec(readFileSync("migrations/0068_notebook_share_passwords.sql", "utf8"));
+ if (legacyHash) db.run("UPDATE notebook_shares SET password_hash = ?", [legacyHash]);
+ db.exec(readFileSync("migrations/0069_share_password_encryption.sql", "utf8"));
const environment = {
+ EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY: "test-share-master-key",
storage: createSelfHostedStorageAdapter(
db,
"/tmp/edgeever-notebook-share-unused",
@@ -498,3 +502,91 @@ test("workspace login cannot bypass the notebook password; an unlock grant is st
expect((await f.request(path, { headers: { Cookie: `edgeever_session=owner; ${cookie}` } })).status).toBe(200);
}
});
+
+describe("notebook share password recovery", () => {
+ const ownerPath = "/api/v1/notebooks/root/share";
+ const change = (f, protectedValue = true) => f.app.request(ownerPath, {
+ method: "PATCH", headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ passwordProtected: protectedValue }),
+ }, f.environment);
+
+ test("upgrades a hash-only share in place without invalidating the old password", async () => {
+ const f = fixture(await hashPassword("legacy12"));
+ const owner = await f.app.request(ownerPath, {}, f.environment);
+ expect((await owner.json()).share.password).toBeUndefined();
+ expect(f.db.query("SELECT password_encrypted FROM notebook_shares").get().password_encrypted).toBeNull();
+ const unlock = await f.request("/unlock", {
+ method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ password: "legacy12" }),
+ });
+ expect(unlock.status).toBe(200);
+ const cookie = unlock.headers.get("set-cookie").split(";")[0];
+ expect((await f.request("", { headers: { Cookie: cookie } })).status).toBe(200);
+ const next = (await (await change(f)).json()).share;
+ expect(next.token).toBe(token);
+ expect((await (await f.app.request(ownerPath, {}, f.environment)).json()).share.password).toBe(next.password);
+ expect((await f.request("", { headers: { Cookie: cookie } })).status).toBe(403);
+ });
+
+ test("recovers on a fresh read, hides from other workspaces/agents, and clears ciphertext", async () => {
+ const f = fixture();
+ const share = (await (await change(f)).json()).share;
+ const ciphertext = f.db.query("SELECT password_encrypted FROM notebook_shares").get().password_encrypted;
+ expect(ciphertext).toStartWith("v1.");
+ expect(ciphertext).not.toContain(share.password);
+ const fresh = await f.app.request(ownerPath, {}, f.environment);
+ expect(fresh.headers.get("cache-control")).toBe("private, no-store");
+ expect((await fresh.json()).share.password).toBe(share.password);
+ for (const authKind of ["none", "agent"]) {
+ expect((await f.app.request(ownerPath, { headers: { "test-auth": authKind } }, f.environment)).status).toBe(403);
+ }
+ expect((await (await f.app.request("/api/v1/notebooks/foreign/share", {}, f.environment)).json()).share).toBeNull();
+ // Lost key prevents recovery, but hash-based access is still usable.
+ const previous = f.environment.EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY;
+ f.environment.EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY = "different-key";
+ expect((await (await f.app.request(ownerPath, {}, f.environment)).json()).share.password).toBeUndefined();
+ expect((await f.request("/unlock", {
+ method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ password: share.password }),
+ })).status).toBe(200);
+ f.environment.EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY_PREVIOUS = previous;
+ expect((await (await f.app.request(ownerPath, {}, f.environment)).json()).share.password).toBe(share.password);
+ await change(f, false);
+ expect(f.db.query("SELECT password_encrypted FROM notebook_shares").get().password_encrypted).toBeNull();
+ expect((await (await f.app.request(ownerPath, {}, f.environment)).json()).share.password).toBeUndefined();
+ });
+});
+
+ test("an older server rotating only the hash cannot display stale ciphertext", async () => {
+ const f = fixture();
+ const response = await f.app.request("/api/v1/notebooks/root/share", {
+ method: "PATCH", headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ passwordProtected: true }),
+ }, f.environment);
+ expect(response.status).toBe(200);
+ // Simulate a rollback: the previous server writes only the hash.
+ f.db.run("UPDATE notebook_shares SET password_hash = ?", [await hashPassword("old-server12")]);
+ const read = await f.app.request("/api/v1/notebooks/root/share", {}, f.environment);
+ expect((await read.json()).share.password).toBeUndefined();
+ const unlock = await f.request("/unlock", {
+ method: "POST", headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ password: "old-server12" }),
+ });
+ expect(unlock.status).toBe(200);
+ });
+
+test("missing deployment keys reject regeneration without changing the existing password", async () => {
+ const f = fixture(await hashPassword("existing12"));
+ delete f.environment.EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY;
+ f.app.onError((error, c) => c.json({ error: { code: error.code } }, error.status ?? 500));
+ const before = f.db.query("SELECT password_hash, password_encrypted FROM notebook_shares").get();
+ const response = await f.app.request("/api/v1/notebooks/root/share", {
+ method: "PATCH", headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ passwordProtected: true }),
+ }, f.environment);
+ expect(response.status).toBe(503);
+ expect((await response.json()).error.code).toBe("share_encryption_unavailable");
+ expect(f.db.query("SELECT password_hash, password_encrypted FROM notebook_shares").get()).toEqual(before);
+ expect((await f.request("/unlock", {
+ method: "POST", headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ password: "existing12" }),
+ })).status).toBe(200);
+});
diff --git a/apps/api/src/notebook-share-routes.ts b/apps/api/src/notebook-share-routes.ts
index 89aadcfb..83f28807 100644
--- a/apps/api/src/notebook-share-routes.ts
+++ b/apps/api/src/notebook-share-routes.ts
@@ -24,6 +24,7 @@ import { getAuditActor, getWorkspaceId, requireUser } from "./request-auth";
import { serveSharedResource } from "./share-routes";
import { allowPasswordProtectedShare, setShareAccessCookie } from "./share-http-access";
import { isShareUnlockBlocked, nextShareUnlockFailure, type ShareUnlockState } from "./share-access";
+import { encryptSharePassword, readSharePassword } from "./share-password-encryption";
import { generateSharePassword } from "./share-password";
// Every public query starts at the live share, and constrains every level to
@@ -39,6 +40,7 @@ const publicTreeSql = `WITH RECURSIVE tree(id, workspace_id) AS (
type ShareRow = {
password_hash: string | null;
+ password_encrypted: string | null;
notebook_id: string;
notebook_name: string;
token: string;
@@ -54,7 +56,7 @@ const mapShare = (row: ShareRow, password?: string): NotebookShare => ({
createdAt: row.created_at,
updatedAt: row.updated_at,
});
-const selectShareSql = `SELECT ns.notebook_id, n.name AS notebook_name, ns.password_hash, ns.token, ns.created_at, ns.updated_at
+const selectShareSql = `SELECT ns.notebook_id, n.name AS notebook_name, ns.password_encrypted, ns.password_hash, ns.token, ns.created_at, ns.updated_at
FROM notebook_shares ns JOIN notebooks n ON n.id = ns.notebook_id AND n.workspace_id = ns.workspace_id
WHERE ns.workspace_id = ? AND n.is_deleted = 0`;
const validToken = (token: string) => /^[A-Za-z0-9_-]{43}$/.test(token);
@@ -78,7 +80,7 @@ export const registerNotebookShareRoutes = (app: Hono<AppEnv>) => {
.bind(getWorkspaceId(c), c.req.param("id"))
.first<ShareRow>();
c.header("Cache-Control", "private, no-store");
- return c.json({ share: row ? mapShare(row) : null });
+ return c.json({ share: row ? mapShare(row, row.password_hash ? await readSharePassword(row.password_encrypted, row.token, c.env, row.password_hash) : undefined) : null });
});
app.post("/api/v1/notebooks/:id/share", async (c) => {
const denied = requireUser(c);
@@ -125,7 +127,7 @@ export const registerNotebookShareRoutes = (app: Hono<AppEnv>) => {
{},
);
c.header("Cache-Control", "private, no-store");
- return c.json({ share: mapShare(row) });
+ return c.json({ share: mapShare(row, row.password_hash ? await readSharePassword(row.password_encrypted, row.token, c.env, row.password_hash) : undefined) });
});
app.patch("/api/v1/notebooks/:id/share", zValidator("json", NotebookShareUpdateSchema), async (c) => {
const denied = requireUser(c);
@@ -137,10 +139,11 @@ export const registerNotebookShareRoutes = (app: Hono<AppEnv>) => {
if (!existing) return notFound(c, "Active share not found");
const password = c.req.valid("json").passwordProtected ? generateSharePassword() : undefined;
const passwordHash = password ? await hashPassword(password) : null;
+ const encrypted = password ? await encryptSharePassword(password, existing.token, c.env) : null;
const now = isoNow();
- await c.env.storage.db.prepare(`UPDATE notebook_shares SET password_hash = ?, unlock_failed_count = 0,
+ await c.env.storage.db.prepare(`UPDATE notebook_shares SET password_hash = ?, password_encrypted = ?, unlock_failed_count = 0,
unlock_window_started_at = NULL, unlock_blocked_until = NULL, updated_at = ?
- WHERE notebook_id = ? AND workspace_id = ?`).bind(passwordHash, now, notebookId, workspaceId).run();
+ WHERE notebook_id = ? AND workspace_id = ?`).bind(passwordHash, encrypted, now, notebookId, workspaceId).run();
const actor = getAuditActor(c);
await audit(c.env.storage.db, actor.actorType, actor.actorId,
password ? (existing.password_hash ? "notebook.share_password_rotate" : "notebook.share_password_set") : "notebook.share_password_clear",
diff --git a/apps/api/src/share-password-encryption.test.mjs b/apps/api/src/share-password-encryption.test.mjs
new file mode 100644
index 00000000..253b7eaa
--- /dev/null
+++ b/apps/api/src/share-password-encryption.test.mjs
@@ -0,0 +1,32 @@
+import { describe, expect, test } from "bun:test";
+import { encryptSharePassword, readSharePassword } from "./share-password-encryption";
+
+const env = { EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY: "original-root" };
+describe("recoverable share passwords", () => {
+ test("encrypts with random IVs and binds each ciphertext to its share", async () => {
+ const first = await encryptSharePassword("secret12", "token1", env);
+ const second = await encryptSharePassword("secret12", "token1", env);
+ expect(first).not.toContain("secret12");
+ expect(first).not.toBe(second);
+ expect(await readSharePassword(first, "token1", env)).toBe("secret12");
+ expect(await readSharePassword(first, "token2", env)).toBeUndefined();
+ expect(await readSharePassword(`${first}corrupt`, "token1", env)).toBeUndefined();
+ });
+ test("uses a previous key after rotation; missing keys never fall back to plaintext", async () => {
+ const encrypted = await encryptSharePassword("secret12", "token", env);
+ expect(await readSharePassword(encrypted, "token", {
+ EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY: "new-root",
+ EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY_PREVIOUS: "original-root",
+ })).toBe("secret12");
+ expect(await readSharePassword(encrypted, "token", {})).toBeUndefined();
+ expect(await readSharePassword(null, "token", env)).toBeUndefined();
+ await expect(encryptSharePassword("secret12", "token", {})).rejects.toMatchObject({ code: "share_encryption_unavailable" });
+ });
+ test("supports existing deployment authentication secrets and their fallback", async () => {
+ const encrypted = await encryptSharePassword("secret12", "token", { EDGE_EVER_AUTH_PASSWORD: "old-auth" });
+ expect(await readSharePassword(encrypted, "token", {
+ EDGE_EVER_AUTH_PASSWORD_HASH: "new-auth-hash",
+ EDGE_EVER_AUTH_PASSWORD_FALLBACK: "old-auth",
+ })).toBe("secret12");
+ });
+});
diff --git a/apps/api/src/share-password-encryption.ts b/apps/api/src/share-password-encryption.ts
new file mode 100644
index 00000000..20bd0bcf
--- /dev/null
+++ b/apps/api/src/share-password-encryption.ts
@@ -0,0 +1,38 @@
+import type { Bindings } from "./api-context";
+import { verifyPassword } from "./auth-crypto";
+import { AppError } from "./app-error";
+import { decryptSecret, encryptSecret } from "./secret-encryption";
+
+type Environment = Pick<Bindings,
+ "EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY" | "EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY_PREVIOUS" |
+ "EDGE_EVER_AUTH_PASSWORD" | "EDGE_EVER_AUTH_PASSWORD_HASH" | "EDGE_EVER_AUTH_PASSWORD_FALLBACK">;
+
+// Bind the ciphertext to its share, and separate it from AI/storage credentials.
+const keys = (env: Environment, token: string) => [
+ env.EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY,
+ env.EDGE_EVER_AUTH_PASSWORD,
+ env.EDGE_EVER_AUTH_PASSWORD_HASH,
+ env.EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY_PREVIOUS,
+ env.EDGE_EVER_AUTH_PASSWORD_FALLBACK,
+].flatMap((value) => value?.trim() ? [`edgeever:share-password:v1:${token}:${value.trim()}`] : []);
+
+export const encryptSharePassword = async (password: string, token: string, env: Environment) => {
+ const key = keys({ ...env, EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY_PREVIOUS: undefined,
+ EDGE_EVER_AUTH_PASSWORD_FALLBACK: undefined }, token)[0];
+ if (!key) throw new AppError("share_encryption_unavailable", "Configure a deployment credential encryption key before generating a share password.", 503);
+ return encryptSecret(password, key);
+};
+
+export const readSharePassword = async (encrypted: string | null | undefined, token: string, env: Environment, passwordHash?: string) => {
+ if (!encrypted) return undefined;
+ for (const key of keys(env, token)) {
+ try {
+ const password = await decryptSecret(encrypted, key);
+ // Older servers can rotate the hash without clearing this additive column.
+ return !passwordHash || await verifyPassword(password, passwordHash) ? password : undefined;
+ } catch {
+ // A lost/rotated key must not break an existing share's hash verification.
+ }
+ }
+ return undefined;
+};
diff --git a/apps/api/src/share-routes.test.mjs b/apps/api/src/share-routes.test.mjs
index 315fb976..764e56cd 100644
--- a/apps/api/src/share-routes.test.mjs
+++ b/apps/api/src/share-routes.test.mjs
@@ -85,7 +85,7 @@ const createDatabaseEnvironment = () => {
return {
sqlite,
- environment: { storage: { db: new SqliteD1Database(sqlite), resources: {} } },
+ environment: { EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY: "test-share-master-key", storage: { db: new SqliteD1Database(sqlite), resources: {} } },
};
};
@@ -530,3 +530,32 @@ test("workspace login cannot bypass a memo's password or attachment gate", async
sqlite.close();
}
});
+
+describe("memo share password recovery", () => {
+ test("returns encrypted-at-rest passwords only through authenticated single-share reads", async () => {
+ const { sqlite, environment } = createDatabaseEnvironment();
+ const app = createShareApp(environment);
+ const path = "/api/v1/memos/memo_source/share";
+ const patch = (enabled) => app.request(path, {
+ method: "PATCH", headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ passwordProtected: enabled }),
+ }, environment);
+ const share = (await (await patch(true)).json()).share;
+ expect(sqlite.query("SELECT password_encrypted FROM memo_shares WHERE memo_id = 'memo_source'").get().password_encrypted).not.toContain(share.password);
+ const fresh = await app.request(path, {}, environment);
+ expect(fresh.headers.get("cache-control")).toBe("private, no-store");
+ expect((await fresh.json()).share.password).toBe(share.password);
+ const listed = await app.request("/api/v1/memo-shares", {}, environment);
+ for (const entry of (await listed.json()).shares) {
+ expect(entry.password).toBeUndefined();
+ expect(entry.password_encrypted).toBeUndefined();
+ }
+ const publicApp = new Hono();
+ registerMemoShareRoutes(publicApp);
+ expect((await publicApp.request(path, {}, environment)).status).toBe(403);
+ await patch(false);
+ expect(sqlite.query("SELECT password_encrypted FROM memo_shares WHERE memo_id = 'memo_source'").get().password_encrypted).toBeNull();
+ expect((await (await app.request(path, {}, environment)).json()).share.password).toBeUndefined();
+ sqlite.close();
+ });
+});
diff --git a/apps/api/src/share-routes.ts b/apps/api/src/share-routes.ts
index 7d5b568e..11485c28 100644
--- a/apps/api/src/share-routes.ts
+++ b/apps/api/src/share-routes.ts
@@ -15,12 +15,14 @@ import {
nextShareUnlockFailure,
} from "./share-access";
import { allowPasswordProtectedShare, setShareAccessCookie } from "./share-http-access";
+import { encryptSharePassword, readSharePassword } from "./share-password-encryption";
import { generateSharePassword } from "./share-password";
const SHARE_TOKEN_BYTES = 32;
const SHARE_TOKEN_PATTERN = /^[A-Za-z0-9_-]{43}$/;
type MemoShareRow = {
+ password_encrypted?: string | null;
memo_id: string;
token: string;
created_at: string;
@@ -98,7 +100,7 @@ const loadShareGate = async (c: AppContext, token: string) =>
LIMIT 1`
).bind(token).first<ShareGateRow>();
-const selectMemoShareSql = `SELECT memo_id, token, created_at, updated_at, password_hash
+const selectMemoShareSql = `SELECT memo_id, token, created_at, updated_at, password_hash, password_encrypted
FROM memo_shares WHERE memo_id = ? AND workspace_id = ?`;
const NOTE_PROSE_COLUMNS = `note_prose_font_size, note_prose_line_height, note_prose_palette, note_prose_custom_css, note_prose_custom_colors`;
@@ -365,20 +367,22 @@ export const registerMemoShareRoutes = (app: Hono<AppEnv>) => {
const denied = requireUser(c);
if (denied) return denied;
+ c.header("Cache-Control", "private, no-store");
const row = await c.env.storage.db.prepare(
- `SELECT ms.memo_id, ms.token, ms.created_at, ms.updated_at, ms.password_hash
+ `SELECT ms.memo_id, ms.token, ms.created_at, ms.updated_at, ms.password_hash, ms.password_encrypted
FROM memo_shares ms
INNER JOIN memos m ON m.id = ms.memo_id AND m.workspace_id = ms.workspace_id
WHERE ms.memo_id = ? AND ms.workspace_id = ? AND m.is_deleted = 0
LIMIT 1`
).bind(c.req.param("id"), getWorkspaceId(c)).first<MemoShareRow>();
- return c.json({ share: row ? mapMemoShare(row) : null });
+ return c.json({ share: row ? mapMemoShare(row, row.password_hash ? await readSharePassword(row.password_encrypted, row.token, c.env, row.password_hash) : undefined) : null });
});
app.post("/api/v1/memos/:id/share", async (c) => {
const denied = requireUser(c);
if (denied) return denied;
+ c.header("Cache-Control", "private, no-store");
const memoId = c.req.param("id");
const workspaceId = getWorkspaceId(c);
const memo = await c.env.storage.db.prepare(
@@ -388,7 +392,7 @@ export const registerMemoShareRoutes = (app: Hono<AppEnv>) => {
const existing = await c.env.storage.db.prepare(selectMemoShareSql)
.bind(memoId, workspaceId).first<MemoShareRow>();
- if (existing) return c.json({ share: mapMemoShare(existing) });
+ if (existing) return c.json({ share: mapMemoShare(existing, existing.password_hash ? await readSharePassword(existing.password_encrypted, existing.token, c.env, existing.password_hash) : undefined) });
const now = isoNow();
const token = randomToken(SHARE_TOKEN_BYTES);
@@ -406,13 +410,14 @@ export const registerMemoShareRoutes = (app: Hono<AppEnv>) => {
if (isNewShare) {
await audit(c.env.storage.db, actor.actorType, actor.actorId, "memo.share_create", "memo", memoId, {});
}
- return c.json({ share: mapMemoShare(created) }, isNewShare ? 201 : 200);
+ return c.json({ share: mapMemoShare(created, created.password_hash ? await readSharePassword(created.password_encrypted, created.token, c.env, created.password_hash) : undefined) }, isNewShare ? 201 : 200);
});
app.patch("/api/v1/memos/:id/share", zValidator("json", MemoShareUpdateSchema), async (c) => {
const denied = requireUser(c);
if (denied) return denied;
+ c.header("Cache-Control", "private, no-store");
const memoId = c.req.param("id");
const workspaceId = getWorkspaceId(c);
const existing = await c.env.storage.db.prepare(
@@ -427,7 +432,7 @@ export const registerMemoShareRoutes = (app: Hono<AppEnv>) => {
if (!c.req.valid("json").passwordProtected) {
await c.env.storage.db.prepare(
`UPDATE memo_shares
- SET password_hash = NULL, unlock_failed_count = 0, unlock_window_started_at = NULL,
+ SET password_hash = NULL, password_encrypted = NULL, unlock_failed_count = 0, unlock_window_started_at = NULL,
unlock_blocked_until = NULL, updated_at = ?
WHERE memo_id = ? AND workspace_id = ?`
).bind(now, memoId, workspaceId).run();
@@ -439,12 +444,13 @@ export const registerMemoShareRoutes = (app: Hono<AppEnv>) => {
const password = generateSharePassword();
const passwordHash = await hashPassword(password);
+ const encrypted = await encryptSharePassword(password, existing.token, c.env);
await c.env.storage.db.prepare(
`UPDATE memo_shares
- SET password_hash = ?, unlock_failed_count = 0, unlock_window_started_at = NULL,
+ SET password_hash = ?, password_encrypted = ?, unlock_failed_count = 0, unlock_window_started_at = NULL,
unlock_blocked_until = NULL, updated_at = ?
WHERE memo_id = ? AND workspace_id = ?`
- ).bind(passwordHash, now, memoId, workspaceId).run();
+ ).bind(passwordHash, encrypted, now, memoId, workspaceId).run();
await audit(
c.env.storage.db,
actor.actorType,
@@ -463,6 +469,7 @@ export const registerMemoShareRoutes = (app: Hono<AppEnv>) => {
const denied = requireUser(c);
if (denied) return denied;
+ c.header("Cache-Control", "private, no-store");
const memoId = c.req.param("id");
const workspaceId = getWorkspaceId(c);
const existing = await c.env.storage.db.prepare(
diff --git a/apps/web/src/components/dialogs/ShareMemoDialog.tsx b/apps/web/src/components/dialogs/ShareMemoDialog.tsx
index bae8c4f3..c3f5db21 100644
--- a/apps/web/src/components/dialogs/ShareMemoDialog.tsx
+++ b/apps/web/src/components/dialogs/ShareMemoDialog.tsx
@@ -15,36 +15,6 @@ export const getPublicShareUrl = (token: string) => {
return `${baseUrl.replace(/\/$/, "")}/share/${encodeURIComponent(token)}`;
};
-const sharePasswordStorageKey = (memoId: string) => `edgeever.sharePassword.${memoId}`;
-
-const readStoredSharePassword = (memoId: string, token: string) => {
- try {
- const raw = window.localStorage.getItem(sharePasswordStorageKey(memoId)) || window.sessionStorage.getItem(sharePasswordStorageKey(memoId));
- if (!raw) return "";
- const parsed = JSON.parse(raw) as { token?: string; password?: string };
- return parsed.token === token && typeof parsed.password === "string" ? parsed.password : "";
- } catch {
- return "";
- }
-};
-
-const writeStoredSharePassword = (memoId: string, token: string, password: string) => {
- try {
- window.localStorage.setItem(sharePasswordStorageKey(memoId), JSON.stringify({ token, password }));
- } catch {
- // Storage may be unavailable; the generated password is still shown in this dialog session.
- }
-};
-
-const clearStoredSharePassword = (memoId: string) => {
- try {
- window.localStorage.removeItem(sharePasswordStorageKey(memoId));
- window.sessionStorage.removeItem(sharePasswordStorageKey(memoId));
- } catch {
- // Ignore restricted storage contexts.
- }
-};
-
export const memoShareQueryKey = (memoId: string) => ["memo-share", memoId] as const;
export const ShareMemoDialog = ({
@@ -61,7 +31,6 @@ export const ShareMemoDialog = ({
const queryClient = useQueryClient();
const [copyState, setCopyState] = useState<"idle" | "copied" | "error">("idle");
const [copyTarget, setCopyTarget] = useState<"link" | "password" | "both">("link");
- const [revealedPassword, setRevealedPassword] = useState("");
const copyResetTimerRef = useRef<number | null>(null);
const queryKey = memoShareQueryKey(memoId);
const shareQuery = useQuery({
@@ -69,6 +38,8 @@ export const ShareMemoDialog = ({
queryFn: () => api.getMemoShare(memoId),
enabled: open,
retry: false,
+ gcTime: 0,
+ refetchOnMount: "always",
});
const createMutation = useMutation({
mutationFn: () => api.createMemoShare(memoId),
@@ -80,22 +51,13 @@ export const ShareMemoDialog = ({
const passwordMutation = useMutation({
mutationFn: (passwordProtected: boolean) => api.updateMemoShare(memoId, { passwordProtected }),
onSuccess: (data) => {
- queryClient.setQueryData(queryKey, { share: { ...data.share, password: undefined } });
+ queryClient.setQueryData(queryKey, data);
void queryClient.invalidateQueries({ queryKey: ["memo-shares"] });
- if (data.share.password) {
- writeStoredSharePassword(memoId, data.share.token, data.share.password);
- setRevealedPassword(data.share.password);
- } else {
- clearStoredSharePassword(memoId);
- setRevealedPassword("");
- }
},
});
const revokeMutation = useMutation({
mutationFn: () => api.revokeMemoShare(memoId),
onSuccess: () => {
- clearStoredSharePassword(memoId);
- setRevealedPassword("");
queryClient.setQueryData(queryKey, { share: null });
void queryClient.invalidateQueries({ queryKey: ["memo-shares"] });
},
@@ -106,20 +68,13 @@ export const ShareMemoDialog = ({
revokeMutation.reset();
setCopyState("idle");
setCopyTarget("link");
- setRevealedPassword("");
}, [memoId]);
useEffect(() => () => {
if (copyResetTimerRef.current !== null) window.clearTimeout(copyResetTimerRef.current);
}, []);
const share = shareQuery.data?.share ?? null;
- useEffect(() => {
- if (!share?.passwordProtected) {
- setRevealedPassword("");
- return;
- }
- setRevealedPassword(readStoredSharePassword(memoId, share.token));
- }, [memoId, share?.passwordProtected, share?.token]);
+ const revealedPassword = share?.passwordProtected ? share.password ?? "" : "";
const shareUrl = share ? getPublicShareUrl(share.token) : "";
const isWorking = shareQuery.isLoading || createMutation.isPending || passwordMutation.isPending || revokeMutation.isPending;
@@ -148,7 +103,7 @@ export const ShareMemoDialog = ({
return (
<Dialog open={open} onOpenChange={onOpenChange}>
- <DialogContent className="max-w-md space-y-4">
+ <DialogContent className="w-[calc(100%-2rem)] max-w-[640px] space-y-4">
<DialogHeader className="space-y-1.5 text-left">
<DialogTitle className="flex items-center gap-2 text-base font-semibold">
<Share2 className="h-5 w-5 text-slate-700" />
@@ -166,11 +121,11 @@ export const ShareMemoDialog = ({
) : share ? (
<div className="space-y-3.5">
{/* SharePasswordControls renders t("sharing.passwordToggle") */}
- <div className="flex gap-2">
+ <div className="flex flex-col gap-2 sm:flex-row">
<Input value={shareUrl} readOnly aria-label={t("sharing.linkLabel")} className="min-w-0 font-mono text-xs" />
<Button
variant={copyState === "copied" && copyTarget === "link" ? "solid" : copyState === "error" && copyTarget === "link" ? "danger" : "outline"}
- className="min-w-28 shrink-0"
+ className="min-w-28 shrink-0 self-end sm:self-auto"
aria-live="polite"
onClick={() =>
void copyValue(
diff --git a/apps/web/src/components/dialogs/ShareNotebookDialog.tsx b/apps/web/src/components/dialogs/ShareNotebookDialog.tsx
index 0084078d..5daffee0 100644
--- a/apps/web/src/components/dialogs/ShareNotebookDialog.tsx
+++ b/apps/web/src/components/dialogs/ShareNotebookDialog.tsx
@@ -19,36 +19,6 @@ import { copyTextToClipboard } from "@/lib/clipboard";
export const getPublicNotebookShareUrl = (token: string) =>
`${(getConfiguredDesktopApiBaseUrl() || window.location.origin).replace(/\/$/, "")}/share/notebook/${encodeURIComponent(token)}`;
-const notebookSharePasswordStorageKey = (notebookId: string) => `edgeever.notebookSharePassword.${notebookId}`;
-
-const readStoredNotebookSharePassword = (notebookId: string, token: string) => {
- try {
- const raw = window.localStorage.getItem(notebookSharePasswordStorageKey(notebookId)) || window.sessionStorage.getItem(notebookSharePasswordStorageKey(notebookId));
- if (!raw) return "";
- const parsed = JSON.parse(raw) as { token?: string; password?: string };
- return parsed.token === token && typeof parsed.password === "string" ? parsed.password : "";
- } catch {
- return "";
- }
-};
-
-const writeStoredNotebookSharePassword = (notebookId: string, token: string, password: string) => {
- try {
- window.localStorage.setItem(notebookSharePasswordStorageKey(notebookId), JSON.stringify({ token, password }));
- } catch {
- // Storage may be unavailable; the generated password is still shown in this dialog session.
- }
-};
-
-const clearStoredNotebookSharePassword = (notebookId: string) => {
- try {
- window.localStorage.removeItem(notebookSharePasswordStorageKey(notebookId));
- window.sessionStorage.removeItem(notebookSharePasswordStorageKey(notebookId));
- } catch {
- // Ignore restricted storage contexts.
- }
-};
-
export const ShareNotebookDialog = ({
notebookId,
notebookName,
@@ -66,7 +36,6 @@ export const ShareNotebookDialog = ({
const location = useLocation();
const queryClient = useQueryClient();
const [copyState, setCopyState] = useState<"idle" | "copied" | "error">("idle");
- const [revealedPassword, setRevealedPassword] = useState("");
const copyResetTimerRef = useRef<number | null>(null);
const queryKey = [
@@ -80,6 +49,7 @@ export const ShareNotebookDialog = ({
queryFn: () => api.getNotebookShare(notebookId),
enabled: open,
retry: false,
+ gcTime: 0,
refetchOnMount: "always",
});
@@ -97,23 +67,15 @@ export const ShareNotebookDialog = ({
const passwordMutation = useMutation({
mutationFn: (passwordProtected: boolean) => api.updateNotebookShare(notebookId, { passwordProtected }),
onSuccess: (data) => {
- queryClient.setQueryData(queryKey, { share: { ...data.share, password: undefined } });
+ queryClient.setQueryData(queryKey, data);
void invalidate();
- if (data.share.password) {
- writeStoredNotebookSharePassword(notebookId, data.share.token, data.share.password);
- setRevealedPassword(data.share.password);
- } else {
- clearStoredNotebookSharePassword(notebookId);
- setRevealedPassword("");
- }
+
},
});
const revoke = useMutation({
mutationFn: () => api.revokeNotebookShare(notebookId),
onSuccess: () => {
- clearStoredNotebookSharePassword(notebookId);
- setRevealedPassword("");
queryClient.setQueryData(queryKey, { share: null });
setCopyState("idle");
void invalidate();
@@ -125,7 +87,6 @@ export const ShareNotebookDialog = ({
passwordMutation.reset();
revoke.reset();
setCopyState("idle");
- setRevealedPassword("");
}, [notebookId]);
useEffect(() => () => {
@@ -134,13 +95,7 @@ export const ShareNotebookDialog = ({
const share = query.data?.share ?? null;
- useEffect(() => {
- if (!share?.passwordProtected) {
- setRevealedPassword("");
- return;
- }
- setRevealedPassword(readStoredNotebookSharePassword(notebookId, share.token));
- }, [notebookId, share?.passwordProtected, share?.token]);
+ const revealedPassword = share?.passwordProtected ? share.password ?? "" : "";
const shareUrl = share ? getPublicNotebookShareUrl(share.token) : "";
const busy = query.isFetching || create.isPending || revoke.isPending || passwordMutation.isPending;
@@ -162,7 +117,7 @@ export const ShareNotebookDialog = ({
return (
<Dialog open={open} onOpenChange={onOpenChange}>
- <DialogContent className="max-w-md space-y-4">
+ <DialogContent className="w-[calc(100%-2rem)] max-w-[640px] space-y-4">
<DialogHeader className="space-y-1.5 text-left">
<DialogTitle className="flex items-center gap-2 text-base font-semibold">
<Share2 className="h-5 w-5 text-slate-700" />
@@ -189,7 +144,7 @@ export const ShareNotebookDialog = ({
</div>
) : share ? (
<div className="space-y-3.5">
- <div className="flex gap-2">
+ <div className="flex flex-col gap-2 sm:flex-row">
<Input
value={shareUrl}
readOnly
@@ -198,7 +153,7 @@ export const ShareNotebookDialog = ({
/>
<Button
variant={copyState === "copied" ? "solid" : copyState === "error" ? "danger" : "outline"}
- className="min-w-28 shrink-0"
+ className="min-w-28 shrink-0 self-end sm:self-auto"
aria-live="polite"
onClick={() => void handlePrimaryCopy()}
>
diff --git a/apps/web/src/components/dialogs/SharePasswordControls.tsx b/apps/web/src/components/dialogs/SharePasswordControls.tsx
index dd701b6c..448c412f 100644
--- a/apps/web/src/components/dialogs/SharePasswordControls.tsx
+++ b/apps/web/src/components/dialogs/SharePasswordControls.tsx
@@ -93,7 +93,7 @@ export const SharePasswordControls = ({
</Tooltip>
</div>
<p className="text-xs leading-5 text-slate-500">
- {scopeHint || t("sharing.notebookPasswordScopeHint")}
+ {password ? (scopeHint || t("sharing.notebookPasswordScopeHint")) : t("sharing.passwordUnavailableHint")}
</p>
{!hideCopyBoth && password ? (
<Button
diff --git a/docs/share-passwords.md b/docs/share-passwords.md
new file mode 100644
index 00000000..217c39ff
--- /dev/null
+++ b/docs/share-passwords.md
@@ -0,0 +1,13 @@
+# Recoverable share passwords
+
+Note and notebook share passwords use the existing AES-GCM secret encryption component. The database retains a PBKDF2 hash for visitor verification and stores ciphertext for password recovery through the authenticated single-share management endpoint. Public endpoints, share lists, and audit records do not return passwords. The Web client displays the server response without saving new passwords in local or session storage.
+
+The primary root is `EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY`, falling back to `EDGE_EVER_AUTH_PASSWORD` or `EDGE_EVER_AUTH_PASSWORD_HASH` when no dedicated root is configured. Share encryption uses its own purpose prefix and is bound to the share token. Local development already supplies a credential key; Docker persists it in `/data/edgeever-secrets.json`. The business logic is shared by Docker and Cloudflare.
+
+Back up the root separately from the database. For rotation, retain the old dedicated root in `EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY_PREVIOUS`, or the old authentication root in `EDGE_EVER_AUTH_PASSWORD_FALLBACK`. Losing all matching keys prevents password display but leaves hash-based visitor verification working. Regeneration saves a fresh ciphertext under the current root and immediately invalidates the previous password and unlock cookies. A missing root prevents generation before any password is changed; there is no plaintext fallback.
+
+Migration `0069` adds nullable ciphertext columns without rewriting existing hashes or links. Hash-only passwords remain valid but cannot be recovered from the server. Regenerate them once to enable viewing across devices. Browser caches from older clients are no longer used as the displayed password source. Form submission passwords are outside this change.
+
+Apply the migration before deploying the new server. Rolling back application code while retaining the additive columns keeps hash-based access available. If an older server changes a password, regenerate it after upgrading again to refresh the ciphertext. Do not roll back by deleting hashes or restoring an older database snapshot.
+
+Automated verification upgrades an existing hash-only notebook share in place, checks its old password and unlock cookie, then regenerates and reads the password from a fresh authenticated request. Route tests cover ciphertext storage, clearing, key rotation/loss, workspace isolation, API-token/anonymous rejection, and password-free listing responses. These checks do not constitute a production deployment or native device acceptance test.
diff --git a/docs/share-passwords.zh-CN.md b/docs/share-passwords.zh-CN.md
new file mode 100644
index 00000000..4aba67ad
--- /dev/null
+++ b/docs/share-passwords.zh-CN.md
@@ -0,0 +1,13 @@
+# 可再次查看的分享密码
+
+笔记和笔记本分享密码复用现有 AES-GCM Secret 加密组件。数据库保留 PBKDF2 哈希用于验证访客输入,同时保存密文,供登录后的单个分享管理接口读取密码。公开接口、分享列表和审计记录不返回密码。Web 客户端展示服务端响应,不再把新密码保存在 localStorage 或 sessionStorage 中。
+
+优先使用 `EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY` 作为根密钥,未配置独立根密钥时使用 `EDGE_EVER_AUTH_PASSWORD` 或 `EDGE_EVER_AUTH_PASSWORD_HASH`。分享加密使用独立的用途前缀,并与分享 token 绑定。本地开发已提供凭据密钥;Docker 将其持久化到 `/data/edgeever-secrets.json`。Docker 和 Cloudflare 共用此业务逻辑。
+
+请在数据库之外单独备份根密钥。轮换时,把旧独立根密钥保留在 `EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY_PREVIOUS`,或把旧认证根密钥保留在 `EDGE_EVER_AUTH_PASSWORD_FALLBACK`。所有匹配密钥丢失后,密码无法显示,但访客仍可通过哈希验证原密码。重新生成会使用当前根密钥保存新密文,并立即使旧密码和解锁 Cookie 失效。缺少根密钥时,会在修改密码前阻止生成,不会退回明文存储。
+
+Migration `0069` 新增可空的密文列,不改写已有哈希或链接。只有哈希的旧密码仍可使用,但无法从服务端恢复;重新生成一次后即可跨设备查看。旧客户端的浏览器缓存不再作为显示密码的来源。表单提交密码不在此次变更范围内。
+
+部署新服务端前先应用 Migration。回滚应用代码时保留新增列,仍可使用原有哈希验证。如果旧服务端修改了密码,再次升级后应重新生成,以更新密文。不要通过删除哈希或恢复旧数据库快照回滚。
+
+自动验证会原地升级已有的纯哈希笔记本分享,检查原密码和解锁 Cookie,再重新生成并通过新的登录请求读取密码。路由测试覆盖密文存储、清除、密钥轮换或丢失、工作空间隔离、API Token 或匿名请求拒绝,以及分享列表不含密码。这些检查不代表已完成生产部署或原生设备验收。
diff --git a/migrations/0069_share_password_encryption.sql b/migrations/0069_share_password_encryption.sql
new file mode 100644
index 00000000..4a3cc51e
--- /dev/null
+++ b/migrations/0069_share_password_encryption.sql
@@ -0,0 +1,4 @@
+-- Keep hashes for existing access checks and older server versions.
+-- Legacy passwords cannot be recovered; ciphertext is populated on regeneration.
+ALTER TABLE memo_shares ADD COLUMN password_encrypted TEXT;
+ALTER TABLE notebook_shares ADD COLUMN password_encrypted TEXT;
diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.ts
index 0f86d26d..220c8d54 100644
--- a/packages/shared/src/i18n/en-US.ts
+++ b/packages/shared/src/i18n/en-US.ts
@@ -2618,6 +2618,7 @@ export const enUS = {
passwordCopy: "Copy password",
copyLinkAndPassword: "Copy link and password",
regeneratePassword: "Regenerate",
+ passwordUnavailableHint: "This password cannot be displayed. Regenerate it to view it across devices; the previous password will stop working.",
passwordSet: "Password is set",
passwordPrefix: "Password: ",
passwordRequiredTitle: "Password required",
diff --git a/packages/shared/src/i18n/ja.ts b/packages/shared/src/i18n/ja.ts
index 66dc0bc0..e28b9278 100644
--- a/packages/shared/src/i18n/ja.ts
+++ b/packages/shared/src/i18n/ja.ts
@@ -2607,6 +2607,7 @@ export const ja = {
passwordCopy: "パスワードをコピー",
copyLinkAndPassword: "リンクとパスワードをコピー",
regeneratePassword: "再生成",
+ passwordUnavailableHint: "このパスワードは表示できません。再生成すると他の端末でも確認できます。以前のパスワードは無効になります。",
passwordSet: "パスワード設定済み",
passwordPrefix: "パスワード:",
passwordRequiredTitle: "パスワードが必要です",
diff --git a/packages/shared/src/i18n/pl.ts b/packages/shared/src/i18n/pl.ts
index 3f4c93b9..d606ddb3 100644
--- a/packages/shared/src/i18n/pl.ts
+++ b/packages/shared/src/i18n/pl.ts
@@ -2607,6 +2607,7 @@ export const pl = {
passwordCopy: "Kopiuj hasło",
copyLinkAndPassword: "Kopiuj link i hasło",
regeneratePassword: "Wygeneruj ponownie",
+ passwordUnavailableHint: "Nie można wyświetlić tego hasła. Wygeneruj nowe, aby wyświetlać je na innych urządzeniach; poprzednie hasło przestanie działać.",
passwordSet: "Hasło jest ustawione",
passwordPrefix: "Hasło: ",
passwordRequiredTitle: "Wymagane hasło",
diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.ts
index 68ec3684..847aecfa 100644
--- a/packages/shared/src/i18n/zh-CN.ts
+++ b/packages/shared/src/i18n/zh-CN.ts
@@ -2616,6 +2616,7 @@ export const zhCN = {
passwordCopy: "复制密码",
copyLinkAndPassword: "复制链接和密码",
regeneratePassword: "重新生成",
+ passwordUnavailableHint: "此密码暂时无法显示。重新生成后可跨设备查看,旧密码将失效。",
passwordSet: "已设置访问密码",
passwordPrefix: "密码:",
passwordRequiredTitle: "需要访问密码",