Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Sign backup with cross-signing key when we reset it." #2175

Merged
merged 1 commit into from
Feb 14, 2022
Merged

Revert "Sign backup with cross-signing key when we reset it." #2175

merged 1 commit into from
Feb 14, 2022

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Feb 14, 2022 •
edited by github-actions bot
Loading

Reverts #2170

cc @uhoreg

This breaks react-sdk e2e test suite with an error like

 * alice joins room "#lltest:localhost" ... failure:  TimeoutError: waiting for selector `.mx_DirectorySearchBox input` failed: timeout 20000ms exceeded
    at new WaitTask (/Users/t3chguy/WebstormProjects/matrix-react-sdk/test/end-to-end-tests/node_modules/puppeteer/lib/cjs/puppeteer/common/DOMWorld.js:509:34)
    at DOMWorld.waitForSelectorInPage (/Users/t3chguy/WebstormProjects/matrix-react-sdk/test/end-to-end-tests/node_modules/puppeteer/lib/cjs/puppeteer/common/DOMWorld.js:420:26)
    at Object.internalHandler.waitFor (/Users/t3chguy/WebstormProjects/matrix-react-sdk/test/end-to-end-tests/node_modules/puppeteer/lib/cjs/puppeteer/common/QueryHandler.js:31:77)
    at DOMWorld.waitForSelector (/Users/t3chguy/WebstormProjects/matrix-react-sdk/test/end-to-end-tests/node_modules/puppeteer/lib/cjs/puppeteer/common/DOMWorld.js:313:29)
    at Frame.waitForSelector (/Users/t3chguy/WebstormProjects/matrix-react-sdk/test/end-to-end-tests/node_modules/puppeteer/lib/cjs/puppeteer/common/FrameManager.js:841:51)
    at Page.waitForSelector (/Users/t3chguy/WebstormProjects/matrix-react-sdk/test/end-to-end-tests/node_modules/puppeteer/lib/cjs/puppeteer/common/Page.js:1335:33)
    at ElementSession.query (/Users/t3chguy/WebstormProjects/matrix-react-sdk/test/end-to-end-tests/lib/src/session.js:133:26)
    at /Users/t3chguy/WebstormProjects/matrix-react-sdk/test/end-to-end-tests/lib/src/usecases/join.js:36:41
    at Generator.next (<anonymous>)
    at fulfilled (/Users/t3chguy/WebstormProjects/matrix-react-sdk/test/end-to-end-tests/lib/src/usecases/join.js:21:58)

Some investigation has shown this is due to the following modal firing for Alice:

image

Digging deeper I found that the js-sdk split-brained on the current backup version:

image
image

#2170 seems to not set a current_version which may cause/propagate such a split-brain.

Here's what your changelog entry will look like:

🐛 Bug Fixes

  • Revert "Sign backup with cross-signing key when we reset it." (#2175).

@t3chguy t3chguy requested a review from a team as a code owner February 14, 2022 19:06
turt2live
turt2live approved these changes Feb 14, 2022
View reviewed changes
Copy link
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😢

@t3chguy t3chguy merged commit 2bb1469 into develop Feb 14, 2022
@t3chguy t3chguy deleted the revert-2170-crosssign_backup_when_resetting branch February 14, 2022 19:11
@t3chguy
Copy link
Member Author

t3chguy commented Feb 14, 2022

E2E tests confirmed fixed https://github.com/matrix-org/matrix-react-sdk/runs/5189409501?check_suite_focus=true

su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Mar 5, 2022
@su-ex
Merge tag 'v15.6.0' into sc
8502dd1 
* Return send event response from MSC3089Branch.createNewVersion() ([\matrix-org#2186](matrix-org#2186)).
* Add functions to support refresh tokens ([\matrix-org#2178](matrix-org#2178)).
* [Release] Fix bug with the /hierarchy API sending invalid requests ([\matrix-org#2202](matrix-org#2202)).
* Fix bug where calls could break if rejected from somewhere else ([\matrix-org#2189](matrix-org#2189)).
* Fix camera stuck on after call transfer ([\matrix-org#2188](matrix-org#2188)).
* Fix synthetic read receipt handling ([\matrix-org#2174](matrix-org#2174)). Fixes element-hq/element-web#21016.
* Revert "Sign backup with cross-signing key when we reset it." ([\matrix-org#2175](matrix-org#2175)).
* Sign backup with cross-signing key when we reset it. ([\matrix-org#2170](matrix-org#2170)).
* Fix error in uploadContent() when file is empty under Node.js ([\matrix-org#2155](matrix-org#2155)).
* Check the backup info against the stored private key when determining trust. ([\matrix-org#2167](matrix-org#2167)).
* Back up keys before logging out ([\matrix-org#2158](matrix-org#2158)). Fixes element-hq/element-web#13151.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@turt2live turt2live turt2live approved these changes

Assignees
No one assigned
Labels
T-Defect
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@t3chguy @turt2live