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.

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

Reset cross-signing before backup when resetting both #28402

Merged
merged 5 commits into from
Nov 19, 2024

Conversation

uhoreg
Copy link
Member

@uhoreg uhoreg commented Nov 6, 2024

so that the backup gets signed by the new cross-signing key

Checklist

  • Tests written for new code (and old code if feasible).
  • New or updated public/exported symbols have accurate TSDoc documentation.
  • Linter and other CI checks pass.
  • I have licensed the changes to Element by completing the Contributor License Agreement (CLA)

@uhoreg
Copy link
Member Author

uhoreg commented Nov 8, 2024

The Jest test looks like just a flaky test. No idea why SonarCloud isn't reporting anything. And earlier version of this PR had 70% test coverage. I've since added another test, but I don't know if that's enough for SonarCloud until SonarCloud returns its result. I think that this PR is otherwise ready for review.

@uhoreg uhoreg marked this pull request as ready for review November 8, 2024 02:28
@uhoreg uhoreg requested review from a team as code owners November 8, 2024 02:28
@t3chguy
Copy link
Member

t3chguy commented Nov 11, 2024

If a jest test fails/flakes then Sonar won't run as it won't have a complete junit report to work from

@florianduros florianduros removed their request for review November 14, 2024 10:13
* cross-signing to be reset (so that the new backup can be
* signed by the new cross-signing key). So we reset secret
* storage first, then cross-signing, then key backup.
*/
logger.log("Forcing secret storage reset");
await crypto.bootstrapSecretStorage({
Copy link
Member

Choose a reason for hiding this comment

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

Why not add the resetCrossSigning as an option to bootstrapSecretStorage?

Copy link
Member Author

Choose a reason for hiding this comment

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

Mainly just to avoid making such an invasive change.

Copy link
Member

@BillCarsonFr BillCarsonFr left a comment

Choose a reason for hiding this comment

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

Just a question, otherwise ok

Merged via the queue into element-hq:develop with commit 0ae74a9 Nov 19, 2024
29 checks passed
@uhoreg uhoreg deleted the reset_4s_fix branch November 19, 2024 03:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants