Skip to content

fix(matrix): prevent double bootstrapCrossSigning reset in forced reset - #95720

Merged
steipete merged 15 commits into
mainfrom
maint/recover-pr-93328-matrix-force-reset
Jun 22, 2026
Merged

fix(matrix): prevent double bootstrapCrossSigning reset in forced reset#95720
steipete merged 15 commits into
mainfrom
maint/recover-pr-93328-matrix-force-reset

Conversation

@vincentkoc

@vincentkoc vincentkoc commented Jun 22, 2026

Copy link
Copy Markdown
Member

What Problem This Solves

Fixes #78396.

This restores the reviewed Matrix E2EE fix from #93328 after the contributor fork branch became unavailable during maintainer sync. --force-reset-cross-signing must not rotate cross-signing, fail on stale/broken SSSS, recreate secret storage, and then rotate again.

Why This Change Was Made

Forced reset now fails closed unless the active Matrix secret-storage recovery key can authenticate the current SSSS key before destructive cross-signing reset work starts. The branch preserves the original reviewed diff and commit authors from #93328, rebased onto current main.

User Impact

Matrix operators get a guarded forced-reset path that avoids destroying E2EE state when the active recovery material cannot unlock secret storage. Docs and Matrix QA messaging explain the active recovery-key requirement.

Evidence

  • Replaces fix(matrix): prevent double bootstrapCrossSigning reset in --force-reset-cross-signing #93328.
  • Autoreview on the original reviewed diff: clean, no accepted/actionable findings.
  • Blacksmith Testbox tbx_01kvq31d9z1hc09q946wr8nj99: node scripts/run-vitest.mjs extensions/matrix/src/matrix/sdk/crypto-bootstrap.test.ts extensions/matrix/src/matrix/sdk/recovery-key-store.test.ts extensions/matrix/src/matrix/sdk.test.ts passed, 3 files / 121 tests.
  • Exact-head GitHub CI pending for this maintainer branch.

@vincentkoc vincentkoc mentioned this pull request Jun 22, 2026
Closed
@openclaw-barnacle openclaw-barnacle Bot added docs Improvements or additions to documentation channel: matrix Channel integration: matrix size: M maintainer Maintainer-authored PR labels Jun 22, 2026
@vincentkoc vincentkoc self-assigned this Jun 22, 2026
@vincentkoc
vincentkoc force-pushed the maint/recover-pr-93328-matrix-force-reset branch from bb2b62c to 577ff15 Compare June 22, 2026 09:22
xialonglee and others added 15 commits June 22, 2026 17:35
@xialonglee @vincentkoc
fix(matrix): prevent double bootstrapCrossSigning reset in --force-re…
3ffdc56 
…set-cross-signing
@xialonglee @vincentkoc
fix(matrix): preserve passwordless forced-reset SSSS guard while prev…
5331c7c 
…enting double reset
@xialonglee @vincentkoc
fix(matrix): block passwordless forced-reset SSSS repair retry to pre…
08bdc54 
…vent double reset
@xialonglee @vincentkoc
fix(matrix): fix test-types CI by annotating mock-calls .some() callback
1e2d645
@steipete @vincentkoc
fix(matrix): preserve passwordless reset recovery
638d03e
@steipete @vincentkoc
fix(matrix): force pre-reset secret storage repair
2f50343
@steipete @vincentkoc
fix(matrix): authenticate before forced crypto reset
0c82065
@steipete @vincentkoc
fix(matrix): fail closed on inaccessible reset storage
3c9fd64
@steipete @vincentkoc
fix(matrix): stop after non-strict reset failure
15b3675
@steipete @vincentkoc
fix(matrix): require valid recovery key before reset
4254d40
@steipete @vincentkoc
docs(matrix): document forced reset recovery key
e78f0da
@steipete @vincentkoc
fix(matrix): preserve multi-key recovery selection
20c6a69
@steipete @vincentkoc
fix(matrix): make reset recovery guidance command-neutral
49d1da5
@steipete @vincentkoc
test(matrix): exercise guarded cross-signing reset
592d458
@steipete @vincentkoc
fix(matrix): require durable authenticated recovery keys
afa7684
@vincentkoc
vincentkoc force-pushed the maint/recover-pr-93328-matrix-force-reset branch from 577ff15 to afa7684 Compare June 22, 2026 09:35
@steipete

steipete commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

Land-ready maintainer verification:

  • Deep review covered the forced-reset entry point, Matrix SDK cross-signing/secret-storage behavior, recovery-key persistence, callers, sibling retry paths, and scoped docs. The safe public-API fix validates durable or explicitly staged recovery material before mutation, performs one reset at most, and fails closed instead of generating another identity.

  • Fresh autoreview: clean after resolving the recovery-key authentication and durability findings.

  • Focused tests: Matrix SDK/bootstrap/recovery-store plus QA contract scenarios — 208 passed. Matrix CLI coverage also passed earlier in the fixup cycle.

  • Docs: pnpm docs:check-mdx passed 677 files; pnpm docs:check-links checked 4454 links with zero broken.

  • Live Matrix E2E: Azure Crabbox run run_b17135306943 passed matrix-e2ee-bootstrap-success 4/4 after establishing secret storage and then exercising the guarded reset. Run run_3cec59a9871f separately proved a fresh account without recovery material is rejected before reset.

  • Current prepared head: afa7684e4bf4e4a431ccd099af888f3999b439dc; exact-head hosted CI passed in run 27943401964.

  • scripts/pr prepare-run 95720: completed.

Known gaps: matrix-js-sdk does not expose an atomic/resumable reset API, so the deliberate product contract is to require the active recovery key before destructive reset.

@steipete
steipete merged commit 03a71f3 into main Jun 22, 2026
86 checks passed
@steipete
steipete deleted the maint/recover-pr-93328-matrix-force-reset branch June 22, 2026 09:45
@steipete

steipete commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

Merged via squash.

Thanks @vincentkoc!

@steipete steipete mentioned this pull request Jun 22, 2026
Closed
@clawsweeper clawsweeper Bot mentioned this pull request Jun 22, 2026
Closed
github-actions Bot pushed a commit to Desicool/openclaw that referenced this pull request Jun 23, 2026
@vincentkoc @steipete
fix(matrix): prevent double bootstrapCrossSigning reset in forced res…
d6d950a 
…et (openclaw#95720)

Merged via squash.

Prepared head SHA: afa7684
Co-authored-by: vincentkoc <25068+vincentkoc@users.noreply.github.com>
Co-authored-by: steipete <58493+steipete@users.noreply.github.com>
Reviewed-by: @steipete
This was referenced Jun 26, 2026
Open
Closed
This was referenced Jul 1, 2026
Merged
Open
@clawsweeper clawsweeper Bot mentioned this pull request Sep 8, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@vincentkoc vincentkoc

Labels

channel: matrix Channel integration: matrix docs Improvements or additions to documentation maintainer Maintainer-authored PR size: M

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

BUG: --force-reset-cross-signing fires bootstrapCrossSigning TWICE, destroys E2EE state, leaves recovery-key.json pointing at empty secret storage

3 participants

@vincentkoc @steipete @xialonglee