@rapidmx/web-client 0.35.0 → 0.37.0

package/lib/crypto/sharedMailboxKeys.ts

@@ -0,0 +1,402 @@
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2026 Jean-Philippe Steinmetz
+// SPDX-License-Identifier: MPL-2.0
+///////////////////////////////////////////////////////////////////////////////
+/**
+ * Shared mailboxes' zero-access keys (restapi `specs/search.md` §3 *Shared Mailboxes*). A mailbox someone else owns, or that has no owner,
+ * has no master key its members know: its zero-access private key is instead wrapped to each member's own zero-access certificate
+ * (member key wraps), and a member opens it with the zero-access key of a mailbox they own - so a member unlocks it without a password,
+ * once their own mailbox is unlocked. Members get the ability to read, never the master key, signing key or encryption keys.
+ *
+ * `unlockSharedMailbox()` opens a shared mailbox for its member. `maintainSharedMailbox()` is what the client of the owner, or of a member
+ * with full access, does in the background: provisions a key for a mailbox without an owner, wraps the keys for members still waiting,
+ * and - once someone who held the key has left - rotates it, so new mail is encrypted to a key they never had. A mailbox without an owner
+ * has no master key for escrow to open, so when it is assigned to an escrow scope each of its keys is also wrapped to the scope's
+ * certificate: with a new key in the same write, and for keys the scope is still missing (`escrowPending`) in the background.
+ */
+import { type ApiClient, ApiRequestError } from "../util/api.js";
+import { fromBase64, toBase64 } from "./encoding.js";
+import {
+    enrollSharedZeroAccessKey,
+    type EscrowInfo,
+    getEncryptionPolicy,
+    getEscrowInfo,
+    getKeyVault,
+    getMyMemberKeyWraps,
+    getSharedKeyStatus,
+    type MemberKeyWrap,
+    putMemberKeyWraps,
+    putZeroAccessEscrowWraps,
+    removeMemberKeyWraps,
+    type SharedKeyStatus,
+    type ZeroAccessEscrowWrapInput,
+    type ZeroAccessKey,
+} from "./keyvaultApi.js";
+import { certificateHoldsKey } from "./keyPairMatch.js";
+import { exportPrivateKeyPkcs8, generateKeyPairWithCsr, importPrivateKeyPkcs8 } from "./keys.js";
+import {
+    addZeroAccessKey,
+    getUnlockedKeys,
+    installSharedSession,
+    personalSessions,
+    type RetainedEncryptionKey,
+    sharedUnlockGeneration,
+    type UnlockedKeys,
+    ZERO_ACCESS_PRIVATE_KEY_AAD_PURPOSE,
+} from "./keySession.js";
+import { buildAad, openWithKey } from "./masterKey.js";
+import { decryptEnvelopedDataWithKeys, encryptForRecipients } from "./smime.js";
+import { provisionZeroAccessKey } from "./zeroAccessKey.js";
+
+/** What `unlockSharedMailbox()` found. */
+export type SharedUnlockOutcome =
+    /** Its keys are open in this session. */
+    | "unlocked"
+    /** The caller is a member but holds no wrap yet: another member's client shares the key with them shortly. */
+    | "pending"
+    /** The caller is a member, but none of their own mailboxes is unlocked to open their wraps with. */
+    | "own_keys_locked"
+    /** Not a shared mailbox of the caller's (they own it, or have no member access): its own unlock applies. */
+    | "not_shared";
+
+/** Domain-separation prefix of the secret a shared session's `masterKey` stands for. */
+const SESSION_SECRET_LABEL = new TextEncoder().encode("rapidmx-shared-mailbox-session-v1:");
+
+async function sessionSecret(pkcs8: Uint8Array): Promise<Uint8Array> {
+    const input = new Uint8Array(SESSION_SECRET_LABEL.length + pkcs8.length);
+    input.set(SESSION_SECRET_LABEL);
+    input.set(pkcs8, SESSION_SECRET_LABEL.length);
+    try {
+        return new Uint8Array(await crypto.subtle.digest("SHA-256", input));
+    } finally {
+        input.fill(0);
+    }
+}
+
+/** One of the user's own zero-access keys, with the mailbox it belongs to. */
+type OwnKey = RetainedEncryptionKey & { mailboxUid: string };
+
+/** The zero-access keys of the mailboxes this user has unlocked themselves - what their member wraps are addressed to. */
+function ownZeroAccessKeys(): OwnKey[] {
+    return personalSessions().flatMap(({ mailboxUid, unlocked }) => (unlocked.zeroAccessKeys ?? []).map((key) => ({ ...key, mailboxUid })));
+}
+
+/** Opens `wrap` with the user's own keys: the wrapped PKCS#8 (the caller zeroes it) and the own mailbox whose key opened it, or `undefined`
+ * when no own key opens it. */
+async function openWrap(wrap: MemberKeyWrap, own: OwnKey[]): Promise<{ pkcs8: Uint8Array; openedWith: string } | undefined> {
+    const recipient = own.find((key) => key.fingerprint === wrap.recipientFingerprint);
+    if (!recipient) {
+        return undefined;
+    }
+    try {
+        return { pkcs8: await decryptEnvelopedDataWithKeys(fromBase64(wrap.cms), [recipient]), openedWith: recipient.mailboxUid };
+    } catch {
+        return undefined;
+    }
+}
+
+/** The active key first, then the others newest first - the order `UnlockedKeys.zeroAccessKeys` keeps. */
+function keyOrder(status: Pick<SharedKeyStatus, "activeKeyFingerprint" | "zeroAccessKeys">): (fingerprint: string) => number {
+    const rank = new Map<string, number>(
+        [...status.zeroAccessKeys]
+            .sort((a, b) => Number(a.fingerprint !== status.activeKeyFingerprint) - Number(b.fingerprint !== status.activeKeyFingerprint) || b.notBefore - a.notBefore)
+            .map((key, index) => [key.fingerprint, index]),
+    );
+    return (fingerprint) => rank.get(fingerprint) ?? Number.MAX_SAFE_INTEGER;
+}
+
+/**
+ * Opens shared mailbox `mailboxUid` for its member, with no password: their member wraps, opened with the zero-access keys of a mailbox they
+ * own and have unlocked, become this session's keys for it (`installSharedSession()`). See `SharedUnlockOutcome` for when it can't.
+ *
+ * `refresh`: a shared session already open is opened again when it lacks the mailbox's active key and the member now holds a wrap of it -
+ * after a rotation, new mail is sealed to a key the session doesn't have. Its `masterKey` secret is kept, so the local index stays readable.
+ */
+export async function unlockSharedMailbox(mailboxUid: string, client?: ApiClient, refresh = false): Promise<SharedUnlockOutcome> {
+    const existing: UnlockedKeys | undefined = getUnlockedKeys(mailboxUid);
+    if (existing && !(refresh && existing.shared)) {
+        return "unlocked";
+    }
+    const generation: string = sharedUnlockGeneration(mailboxUid);
+    let status: SharedKeyStatus;
+    try {
+        status = await getSharedKeyStatus(mailboxUid, client);
+    } catch (err) {
+        if (err instanceof ApiRequestError && (err.status === 403 || err.status === 404)) {
+            return existing ? "unlocked" : "not_shared";
+        }
+        throw err;
+    }
+    const holdsActive = (keys: { fingerprint: string }[] | undefined): boolean => !!keys?.some((key) => key.fingerprint === status.activeKeyFingerprint);
+    if (existing && (!status.activeKeyFingerprint || holdsActive(existing.zeroAccessKeys))) {
+        return "unlocked";
+    }
+    if (status.role !== "member") {
+        return existing ? "unlocked" : "not_shared";
+    }
+    const wraps: MemberKeyWrap[] = await getMyMemberKeyWraps(mailboxUid, client);
+    // Nothing new to open yet: the active key's wrap is still on its way.
+    if (existing && !holdsActive(wraps.map((wrap) => ({ fingerprint: wrap.zeroAccessKeyFingerprint })))) {
+        return "unlocked";
+    }
+    if (wraps.length === 0) {
+        return "pending";
+    }
+    const own = ownZeroAccessKeys();
+    const rank = keyOrder(status);
+    const opened: RetainedEncryptionKey[] = [];
+    const openedWith: Set<string> = new Set();
+    let secret: Uint8Array | undefined;
+    for (const wrap of [...wraps].sort((a, b) => rank(a.zeroAccessKeyFingerprint) - rank(b.zeroAccessKeyFingerprint))) {
+        const certificate: ZeroAccessKey | undefined = status.zeroAccessKeys.find((key) => key.fingerprint === wrap.zeroAccessKeyFingerprint);
+        const unwrapped = certificate ? await openWrap(wrap, own) : undefined;
+        if (!certificate || !unwrapped) {
+            continue;
+        }
+        const pkcs8 = unwrapped.pkcs8;
+        try {
+            // The certificate is the server's: one that isn't this key's must never be what this session seals to.
+            if (!(await certificateHoldsKey(fromBase64(certificate.publicKey), pkcs8))) {
+                continue;
+            }
+            secret ??= await sessionSecret(pkcs8);
+            const privateKey = await importPrivateKeyPkcs8(pkcs8, { name: "ECDH", namedCurve: "P-256" }, ["deriveBits"]);
+            opened.push({ fingerprint: wrap.zeroAccessKeyFingerprint, certDer: fromBase64(certificate.publicKey), privateKey });
+            openedWith.add(unwrapped.openedWith);
+        } catch {
+            // A wrap that doesn't hold a usable key (or one its certificate doesn't match) is skipped; the others still open the mailbox.
+        } finally {
+            pkcs8.fill(0);
+        }
+    }
+    if (!secret || opened.length === 0) {
+        return existing ? "unlocked" : "own_keys_locked";
+    }
+    if (existing) {
+        // Opened again: the secret the local index key is derived from stays the one the session started with.
+        secret.fill(0);
+        secret = new Uint8Array(existing.masterKey);
+    }
+    const unlocked: UnlockedKeys = { masterKey: secret, zeroAccessKeys: opened, openedWith: [...openedWith] };
+    installSharedSession(mailboxUid, unlocked, generation);
+    return "unlocked";
+}
+
+/** The PKCS#8 of every zero-access key of `mailboxUid` the caller can open, by fingerprint - from the vault with the owner's unlocked master
+ * key, or from the caller's own member wraps. Only keys whose certificate in `status` (the server's) is really theirs: a key is wrapped
+ * for members and escrow under that certificate's fingerprint, so a mismatched one is left out. The caller zeroes them. */
+async function openPrivateKeys(
+    mailboxUid: string,
+    status: SharedKeyStatus,
+    ownerUnlocked: UnlockedKeys | undefined,
+    client?: ApiClient,
+): Promise<Map<string, Uint8Array>> {
+    const keys = new Map<string, Uint8Array>();
+    const keep = async (fingerprint: string, pkcs8: Uint8Array): Promise<void> => {
+        const certificate = status.zeroAccessKeys.find((key) => key.fingerprint === fingerprint);
+        if (certificate && (await certificateHoldsKey(fromBase64(certificate.publicKey), pkcs8))) {
+            keys.set(fingerprint, pkcs8);
+        } else {
+            pkcs8.fill(0);
+        }
+    };
+    if (ownerUnlocked) {
+        const vault = await getKeyVault(mailboxUid, client);
+        const aad = buildAad(mailboxUid, ZERO_ACCESS_PRIVATE_KEY_AAD_PURPOSE);
+        for (const key of status.zeroAccessKeys) {
+            const wrapped = vault.wrappedKeys.find((w) => w.fingerprint === key.fingerprint && w.useType === "zero-access");
+            if (wrapped) {
+                try {
+                    await keep(key.fingerprint, await openWithKey(ownerUnlocked.masterKey, wrapped, aad));
+                } catch {
+                    // Sealed under a master key since replaced: not this device's to share.
+                }
+            }
+        }
+        return keys;
+    }
+    const own = ownZeroAccessKeys();
+    for (const wrap of await getMyMemberKeyWraps(mailboxUid, client)) {
+        const unwrapped = await openWrap(wrap, own);
+        if (unwrapped) {
+            await keep(wrap.zeroAccessKeyFingerprint, unwrapped.pkcs8);
+        }
+    }
+    return keys;
+}
+
+async function wrapFor(member: { userUid: string; certificate: ZeroAccessKey }, pkcs8: Uint8Array): Promise<Omit<MemberKeyWrap, "zeroAccessKeyFingerprint">> {
+    return {
+        memberUserUid: member.userUid,
+        recipientFingerprint: member.certificate.fingerprint,
+        cms: toBase64(await encryptForRecipients(pkcs8, [fromBase64(member.certificate.publicKey)])),
+    };
+}
+
+/** The members with a certificate of their own - the ones a key can be wrapped for. A certificate listed under the fingerprint of one of
+ * this user's own opened zero-access keys must be that key's certificate (checked against its private key at unlock): one the server
+ * swapped is left out, so a wrap meant for this user never goes to a key that isn't theirs. */
+function wrappable(status: SharedKeyStatus): { userUid: string; certificate: ZeroAccessKey; wrapped: string[] }[] {
+    const own = ownZeroAccessKeys();
+    return status.members.filter((member): member is typeof member & { certificate: ZeroAccessKey } => {
+        if (!member.certificate) {
+            return false;
+        }
+        const mine = own.find((key) => key.fingerprint === member.certificate!.fingerprint);
+        return !mine || sameBytes(mine.certDer, fromBase64(member.certificate.publicKey));
+    });
+}
+
+function sameBytes(a: Uint8Array, b: Uint8Array): boolean {
+    return a.length === b.length && a.every((byte, index) => byte === b[index]);
+}
+
+/** `pkcs8` wrapped to the certificate of the escrow scope `escrow` describes. */
+async function escrowWrapFor(escrow: EscrowInfo, pkcs8: Uint8Array): Promise<Omit<ZeroAccessEscrowWrapInput, "zeroAccessKeyFingerprint">> {
+    return { escrowScopeId: escrow.escrowScopeId, cms: toBase64(await encryptForRecipients(pkcs8, [fromBase64(escrow.publicKey.publicKey)])) };
+}
+
+/** A new keypair for a mailbox without an owner, enrolled together with a wrap of it for every member who can receive one, and for its
+ * escrow scope when it has one. */
+async function enrollNewSharedKey(mailboxUid: string, mailboxAddress: string, status: SharedKeyStatus, client?: ApiClient): Promise<SharedKeyStatus> {
+    const escrow: EscrowInfo | undefined = status.escrowScopeId ? await getEscrowInfo(mailboxUid, client) : undefined;
+    const { keyPair, csrPem } = await generateKeyPairWithCsr(mailboxAddress, "encrypt");
+    const pkcs8 = await exportPrivateKeyPkcs8(keyPair.privateKey);
+    try {
+        const wraps = await Promise.all(wrappable(status).map((member) => wrapFor(member, pkcs8)));
+        const escrowWrap = escrow ? await escrowWrapFor(escrow, pkcs8) : undefined;
+        return await enrollSharedZeroAccessKey(mailboxUid, { csr: csrPem, wraps, ...(escrowWrap ? { escrowWrap } : {}) }, client);
+    } finally {
+        pkcs8.fill(0);
+    }
+}
+
+/** What `maintainSharedMailbox()` did. */
+export interface SharedMaintenance {
+    provisioned: boolean;
+    rotated: boolean;
+    /** Wraps added for waiting members. */
+    wrapped: number;
+    /** Wraps of older keys the server refused for waiting members (tried again on the next pass). */
+    refused: number;
+    /** Departed users whose wraps were removed. */
+    removed: number;
+    /** Keys wrapped for the mailbox's escrow scope. */
+    escrowed: number;
+    /**
+     * The server's reason when it refused (400) the new key of a pending rotation - e.g. the vault couldn't hold the new key's member wraps
+     * next to those it holds - so the current key stays active and members keep reading; the rotation is tried again on the next pass.
+     */
+    rotationRefused?: string;
+}
+
+/**
+ * The background care of a shared mailbox, run by the client of its owner or of a member with full access (`status.manager`); nothing for
+ * anyone else, or while the keys it needs are locked:
+ *
+ * A mailbox without an owner and without a key gets one (unless the administrator disallows zero-access), wrapped for every member who has a
+ * certificate. Once a user who held the active key has left (`rotationPending`), a new key replaces it - enrolled by the owner with their
+ * master key (`provisionZeroAccessKey()`), or for a mailbox without an owner with the members' wraps - and then the departed users' wraps
+ * are removed. Members still waiting (`pending`) get wraps of every key this client can open, one write per key with the active key's
+ * first (a refused older key doesn't stop the rest), and the escrow scope of a mailbox without an owner gets copies of the keys it is
+ * missing (`escrowPending`). A rotation the server refuses (400) is reported in `rotationRefused`, not thrown: the current key stays active
+ * and the rest of the pass goes ahead.
+ */
+export async function maintainSharedMailbox(mailboxUid: string, mailboxAddress: string, client?: ApiClient): Promise<SharedMaintenance> {
+    const result: SharedMaintenance = { provisioned: false, rotated: false, wrapped: 0, refused: 0, removed: 0, escrowed: 0 };
+    let status: SharedKeyStatus = await getSharedKeyStatus(mailboxUid, client);
+    if (!status.manager || (status.members.length === 0 && status.departed.length === 0)) {
+        return result;
+    }
+    const ownerUnlocked = status.role === "owner" ? getUnlockedKeys(mailboxUid) : undefined;
+    if (status.role === "owner" && (!ownerUnlocked || ownerUnlocked.shared)) {
+        return result;
+    }
+
+    if (status.ownerless && !status.activeKeyFingerprint) {
+        const policy = await getEncryptionPolicy(client).catch(() => undefined);
+        if (policy?.allowZeroAccess === false || ownZeroAccessKeys().length === 0) {
+            return result;
+        }
+        status = await enrollNewSharedKey(mailboxUid, mailboxAddress, status, client);
+        result.provisioned = true;
+    } else if (status.rotationPending) {
+        try {
+            if (status.ownerless) {
+                status = await enrollNewSharedKey(mailboxUid, mailboxAddress, status, client);
+            } else {
+                const vault = await getKeyVault(mailboxUid, client);
+                const { key } = await provisionZeroAccessKey(mailboxUid, mailboxAddress, ownerUnlocked!.masterKey, vault.masterKeyGeneration, client);
+                // The owner's open session gets the new key as its active one, as `ensureZeroAccessKey()` does: new mail is sealed to it.
+                addZeroAccessKey(mailboxUid, ownerUnlocked!, key);
+                status = await getSharedKeyStatus(mailboxUid, client);
+            }
+            result.rotated = true;
+        } catch (err) {
+            // Refused before any key was issued (restapi: the vault can't hold the new key's member wraps next to those it holds): the
+            // current key stays active, so the rest of the pass - waiting members' wraps of it - still goes ahead. Anything else throws.
+            if (!(err instanceof ApiRequestError) || err.status !== 400) {
+                throw err;
+            }
+            result.rotationRefused = err.message;
+        }
+    }
+    // The departed hold no wrap of the active key any more (or never did): their old wraps go.
+    if (!status.rotationPending) {
+        for (const departed of status.departed) {
+            status = await removeMemberKeyWraps(mailboxUid, departed, client);
+            result.removed++;
+        }
+    }
+
+    const missing = wrappable(status).filter((member) => status.zeroAccessKeys.some((key) => !member.wrapped.includes(key.fingerprint)));
+    const escrowPending: string[] = status.ownerless && status.escrowScopeId ? (status.escrowPending ?? []) : [];
+    if (missing.length > 0 || escrowPending.length > 0) {
+        const keys = await openPrivateKeys(mailboxUid, status, ownerUnlocked, client);
+        try {
+            // One write per key, the active key's first: it alone opens new mail, so a refused backfill of an older key (the server bounds
+            // each key's wraps and the vault's total) never keeps a member from it. A failed older key is left for the next pass.
+            const order = keyOrder(status);
+            for (const [fingerprint, pkcs8] of [...keys].sort(([a], [b]) => order(a) - order(b))) {
+                const wraps: MemberKeyWrap[] = [];
+                for (const member of missing) {
+                    if (!member.wrapped.includes(fingerprint)) {
+                        wraps.push({ ...(await wrapFor(member, pkcs8)), zeroAccessKeyFingerprint: fingerprint });
+                    }
+                }
+                if (wraps.length === 0) {
+                    continue;
+                }
+                if (fingerprint === status.activeKeyFingerprint) {
+                    await putMemberKeyWraps(mailboxUid, wraps, client);
+                    result.wrapped += wraps.length;
+                } else {
+                    try {
+                        await putMemberKeyWraps(mailboxUid, wraps, client);
+                        result.wrapped += wraps.length;
+                    } catch {
+                        result.refused += wraps.length;
+                    }
+                }
+            }
+            const held: string[] = escrowPending.filter((fingerprint) => keys.has(fingerprint));
+            if (held.length > 0) {
+                const escrow: EscrowInfo = await getEscrowInfo(mailboxUid, client);
+                // Assigned to another scope since the status was read: the next pass sees it.
+                if (escrow.escrowScopeId === status.escrowScopeId) {
+                    const escrowWraps: ZeroAccessEscrowWrapInput[] = [];
+                    for (const fingerprint of held) {
+                        escrowWraps.push({ ...(await escrowWrapFor(escrow, keys.get(fingerprint)!)), zeroAccessKeyFingerprint: fingerprint });
+                    }
+                    await putZeroAccessEscrowWraps(mailboxUid, escrowWraps, client);
+                    result.escrowed = escrowWraps.length;
+                }
+            }
+        } finally {
+            for (const pkcs8 of keys.values()) {
+                pkcs8.fill(0);
+            }
+        }
+    }
+    return result;
+}

package/lib/crypto/smimeMessage.ts

@@ -77,7 +77,8 @@ export function applyBaselineOuterHeaders(headers: ProtectedHeaders): ProtectedH
     return { ...headers, subject: "[...]" };
 }
 
-function base64Wrapped(bytes: Uint8Array): string {
+/** @internal Shared with `pgpMessage.ts`. */
+export function base64Wrapped(bytes: Uint8Array): string {
     const encoded = toBase64(bytes);
     const lines: string[] = [];
     for (let i = 0; i < encoded.length; i += BASE64_LINE_WIDTH) {
@@ -86,7 +87,8 @@ function base64Wrapped(bytes: Uint8Array): string {
     return lines.join(CRLF);
 }
 
-function generateBoundary(): string {
+/** @internal Shared with `pgpMessage.ts`. */
+export function generateBoundary(): string {
     const bytes = crypto.getRandomValues(new Uint8Array(16));
     return `----=_RapidMX_${Array.from(bytes)
         .map((b) => b.toString(16).padStart(2, "0"))
@@ -94,7 +96,7 @@ function generateBoundary(): string {
 }
 
 /** Strips CR/LF/NUL from a header value that has no further encoding (Date, Message-ID, Content-Type). */
-function flattenHeaderValue(value: string): string {
+export function flattenHeaderValue(value: string): string {
     return value.replace(/[\r\n\0]+/g, " ");
 }
 
@@ -116,7 +118,8 @@ function headerLines(headers: ProtectedHeaders, prefix = ""): string[] {
     ];
 }
 
-function protectedHeaderLines(headers: ProtectedHeaders, hpOuter?: ProtectedHeaders): string {
+/** @internal Shared with `pgpMessage.ts`: the protected header block of an inner entity (with `HP-Outer:` copies of `hpOuter`). */
+export function protectedHeaderLines(headers: ProtectedHeaders, hpOuter?: ProtectedHeaders): string {
     const lines = headerLines(headers);
     if (hpOuter) {
         // RFC 9788 Section 2.2.1's `hp-outer` field: the literal string "HP-Outer:" followed by the
@@ -369,7 +372,7 @@ export type ComparableOuterHeaders = Partial<Pick<ProtectedHeaders, "from" | "to
  * (a real bug if reused for this - JSON/`Record` keys aren't multi-valued). Scans the raw header block
  * text directly instead. Returns `undefined` when no `HP-Outer:` lines are present at all, so a caller
  * can distinguish "nothing to compare" from "compared and everything matched". */
-function extractHpOuterHeaders(fields: MimeHeaderField[]): ComparableOuterHeaders | undefined {
+export function extractHpOuterHeaders(fields: MimeHeaderField[]): ComparableOuterHeaders | undefined {
     const result: ComparableOuterHeaders = {};
     let found = false;
     for (const { name, value } of fields) {
@@ -386,7 +389,7 @@ function extractHpOuterHeaders(fields: MimeHeaderField[]): ComparableOuterHeader
 /** `true` when every field `hpOuter` actually carries matches `actualOuterHeaders`' value for that same
  * field - a field `hpOuter` doesn't carry (e.g. no `Cc` on this message) is not compared, since RFC
  * 9788 never claims coverage for it either way. */
-function outerHeadersMatch(hpOuter: ComparableOuterHeaders, actualOuterHeaders: ComparableOuterHeaders): boolean {
+export function outerHeadersMatch(hpOuter: ComparableOuterHeaders, actualOuterHeaders: ComparableOuterHeaders): boolean {
     return (Object.keys(hpOuter) as (keyof ComparableOuterHeaders)[]).every((field) => hpOuter[field] === actualOuterHeaders[field]);
 }
 
@@ -477,7 +480,8 @@ export function splitHeadersAndBody(entity: string): { headers: Record<string, s
     return { headers, contentType: headers["content-type"], body, rawHeaderBlock };
 }
 
-function headersToProtectedHeaders(headers: Record<string, string>): ProtectedHeaders {
+/** @internal Shared with `pgpMessage.ts`. */
+export function headersToProtectedHeaders(headers: Record<string, string>): ProtectedHeaders {
     return {
         from: headers["from"] ?? "",
         to: headers["to"] ?? "",

package/lib/crypto/zeroAccessKey.ts

@@ -0,0 +1,102 @@
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2026 Jean-Philippe Steinmetz
+// SPDX-License-Identifier: MPL-2.0
+///////////////////////////////////////////////////////////////////////////////
+/**
+ * Zero-access keys (restapi `specs/search.md` §3): the per-mailbox keypair the server encrypts mail at rest to on arrival.
+ * Generated here like the encryption key - P-256, its certificate issued by restapi's internal CA from a CSR, its PKCS#8
+ * private key sealed under the mailbox master key - but never published: restapi keeps the certificate on
+ * `Mailbox.zeroAccessKeys` and returns it only with the vault.
+ */
+import type { ApiClient } from "../util/api.js";
+import { fromBase64 } from "./encoding.js";
+import { type KeyVault, enrollKey, getKeyVault } from "./keyvaultApi.js";
+import { certificateHoldsKey } from "./keyPairMatch.js";
+import { exportPrivateKeyPkcs8, generateKeyPairWithCsr, importPrivateKeyPkcs8 } from "./keys.js";
+import { addZeroAccessKey, getUnlockedKeys, type RetainedEncryptionKey, ZERO_ACCESS_PRIVATE_KEY_AAD_PURPOSE } from "./keySession.js";
+import { buildAad, sealWithKey } from "./masterKey.js";
+
+/** What `provisionZeroAccessKey()` resolves with. */
+export interface ProvisionedZeroAccessKey {
+    /** The vault as restapi returned it after the enrollment. */
+    vault: KeyVault;
+    /** The new key, ready to decrypt with (its private key imported non-extractable for ECDH). */
+    key: RetainedEncryptionKey;
+}
+
+/**
+ * Generates a zero-access keypair for `mailboxUid`, seals its private key under `masterKey` and enrolls it. The key becomes
+ * the mailbox's active zero-access key (restapi supersedes any earlier one, whose private key stays in the vault). Pass the
+ * vault's `masterKeyGeneration` read alongside `masterKey` as `expectedMasterKeyGeneration`, so restapi refuses (`409`)
+ * the key if another device rotated the master key meanwhile.
+ */
+export async function provisionZeroAccessKey(
+    mailboxUid: string,
+    mailboxAddress: string,
+    masterKey: Uint8Array,
+    expectedMasterKeyGeneration?: number,
+    client?: ApiClient,
+): Promise<ProvisionedZeroAccessKey> {
+    const { keyPair, csrPem } = await generateKeyPairWithCsr(mailboxAddress, "encrypt");
+    const raw = await exportPrivateKeyPkcs8(keyPair.privateKey);
+    try {
+        const sealed = await sealWithKey(masterKey, raw, buildAad(mailboxUid, ZERO_ACCESS_PRIVATE_KEY_AAD_PURPOSE));
+        const vault = await enrollKey(
+            mailboxUid,
+            {
+                useType: "zero-access",
+                csr: csrPem,
+                wrappedKey: { ciphertext: sealed.ciphertext, nonce: sealed.nonce, algorithm: "AES-256-GCM" },
+                ...(expectedMasterKeyGeneration !== undefined ? { expectedMasterKeyGeneration } : {}),
+            },
+            client,
+        );
+        // restapi appends the new wrapped key last.
+        const enrolled = [...vault.wrappedKeys].reverse().find((k) => k.useType === "zero-access");
+        const certificate = enrolled && vault.zeroAccessKeys?.find((k) => k.fingerprint === enrolled.fingerprint);
+        if (!enrolled || !certificate) {
+            throw new Error("The server did not return the enrolled zero-access key.");
+        }
+        // The certificate is the server's: this device seals to it (index segments, protected meetings' keys), so it must be the new key's.
+        if (!(await certificateHoldsKey(fromBase64(certificate.publicKey), raw))) {
+            throw new Error("The server returned a zero-access certificate that isn't the enrolled key's.");
+        }
+        const privateKey = await importPrivateKeyPkcs8(raw, { name: "ECDH", namedCurve: "P-256" }, ["deriveBits"], false);
+        return { vault, key: { fingerprint: enrolled.fingerprint, certDer: fromBase64(certificate.publicKey), privateKey } };
+    } finally {
+        raw.fill(0);
+    }
+}
+
+/** Provisions already in flight, per mailbox - a second caller (another effect, a re-render) joins the first. */
+const inFlight = new Map<string, Promise<boolean>>();
+
+/**
+ * Gives an unlocked mailbox a zero-access key when it has none yet - how a mailbox set up before zero-access encryption
+ * existed gets one, on its owner's next unlock. Resolves `true` when it enrolled a key (and added it to the session), `false`
+ * when there was nothing to do: the mailbox isn't unlocked, or its vault already holds an unrevoked zero-access key.
+ *
+ * Only the mailbox's owner may call this (restapi refuses anybody else's enrollment); a caller decides that, e.g. from
+ * `KeyEnrollmentGate`'s `canProvision`.
+ */
+export function ensureZeroAccessKey(mailboxUid: string, mailboxAddress: string, client?: ApiClient): Promise<boolean> {
+    const pending = inFlight.get(mailboxUid);
+    if (pending) {
+        return pending;
+    }
+    const run = (async (): Promise<boolean> => {
+        const unlocked = getUnlockedKeys(mailboxUid);
+        if (!unlocked || unlocked.zeroAccessKeys?.length) {
+            return false;
+        }
+        const vault = await getKeyVault(mailboxUid, client);
+        if ((vault.zeroAccessKeys ?? []).some((k) => !k.revokedAt) || vault.wrappedKeys.length === 0) {
+            return false;
+        }
+        const { key } = await provisionZeroAccessKey(mailboxUid, mailboxAddress, unlocked.masterKey, vault.masterKeyGeneration, client);
+        addZeroAccessKey(mailboxUid, unlocked, key);
+        return true;
+    })().finally(() => inFlight.delete(mailboxUid));
+    inFlight.set(mailboxUid, run);
+    return run;
+}

package/lib/mail/conversationsApi.ts

@@ -37,6 +37,9 @@ export interface ConversationSummary {
     latestFrom: Recipient;
     /** The most recent message's `bodyPreview` — the snippet a collapsed row shows. */
     latestPreview: string;
+    /** Set when the latest message is sealed at rest (zero-access): its subject and preview are only in `sealedSummary`, which
+     * `messageSecurity.ts`'s `openZeroAccessSummary()` opens with the mailbox's zero-access keys. */
+    latestZeroAccess?: { keyFingerprint: string; sealedSummary: string };
     /** The most recent message's folder. */
     latestFolderUid: string;
     /** The iTIP `METHOD` of the calendar file the most recent message carries (`Message.meetingMethod`) - `"REQUEST"`, `"REPLY"`,