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

feat!: Allow E2EE rooms to reset its room key #33328

Merged
merged 66 commits into from
Oct 14, 2024
Merged

Conversation

KevLehman
Copy link
Contributor

@KevLehman KevLehman commented Sep 20, 2024

Proposed changes (including videos or screenshots)

Allows authorized users to reset the encryption key of E2EE rooms.

The idea is to prevent situations where all users of a room have lost the keys, and with that, have lost the access to use the room. Now Rocket.Chat will allow them to define a new set of keys for the room via UI.

If a user happens to have a key to the room, after the reset this will be moved to a list of oldRoomKeys, which the UI will use to decode older messages.

Issue(s)

https://rocketchat.atlassian.net/browse/E2EE2-64

Steps to test or reproduce

Further comments

Copy link
Contributor

dionisio-bot bot commented Sep 20, 2024

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

Copy link

changeset-bot bot commented Sep 20, 2024

🦋 Changeset detected

Latest commit: 9fac813

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 37 packages
Name Type
@rocket.chat/meteor Major
@rocket.chat/core-services Patch
@rocket.chat/core-typings Major
@rocket.chat/ddp-client Patch
@rocket.chat/i18n Patch
@rocket.chat/model-typings Patch
@rocket.chat/rest-typings Major
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/network-broker Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/api-client Patch
@rocket.chat/apps Patch
@rocket.chat/cron Patch
@rocket.chat/freeswitch Patch
@rocket.chat/fuselage-ui-kit Major
@rocket.chat/gazzodown Major
@rocket.chat/livechat Patch
@rocket.chat/ui-contexts Major
@rocket.chat/license Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/mock-providers Patch
@rocket.chat/web-ui-registration Major
@rocket.chat/models Patch
@rocket.chat/ui-avatar Major
@rocket.chat/ui-client Major
@rocket.chat/ui-video-conf Major
@rocket.chat/ui-voip Major
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Copy link
Contributor

github-actions bot commented Sep 20, 2024

PR Preview Action v1.4.8
Preview removed because the pull request was closed.
2024-10-14 21:24 UTC

Copy link

codecov bot commented Sep 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.69%. Comparing base (ec8b8e5) to head (9fac813).
Report is 2 commits behind head on release-7.0.0.

Additional details and impacted files

Impacted file tree graph

@@              Coverage Diff               @@
##           release-7.0.0   #33328   +/-   ##
==============================================
  Coverage          74.69%   74.69%           
==============================================
  Files                437      437           
  Lines              20472    20472           
  Branches            5249     5249           
==============================================
  Hits               15291    15291           
  Misses              4569     4569           
  Partials             612      612           
Flag Coverage Δ
unit 74.69% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@KevLehman KevLehman changed the base branch from develop to release-7.0.0 September 24, 2024 21:35
@KevLehman KevLehman changed the title feat: e2e feat: Allow E2EE rooms to reset its room key Sep 27, 2024
@KevLehman KevLehman force-pushed the feat/e2e-key-reset branch 2 times, most recently from d923ab6 to d74cd3d Compare October 2, 2024 16:31
@KevLehman KevLehman added this to the 7.0 milestone Oct 2, 2024
apps/meteor/app/e2e/client/rocketchat.e2e.room.js Outdated Show resolved Hide resolved
apps/meteor/app/e2e/client/rocketchat.e2e.room.js Outdated Show resolved Hide resolved
apps/meteor/client/ui.ts Outdated Show resolved Hide resolved
@MarcosSpessatto MarcosSpessatto changed the title feat: Allow E2EE rooms to reset its room key feat!: Allow E2EE rooms to reset its room key Oct 14, 2024
@KevLehman KevLehman added the stat: QA assured Means it has been tested and approved by a company insider label Oct 14, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Oct 14, 2024
@KevLehman KevLehman merged commit bfefe41 into release-7.0.0 Oct 14, 2024
53 checks passed
@KevLehman KevLehman deleted the feat/e2e-key-reset branch October 14, 2024 21:15
ggazzo added a commit that referenced this pull request Oct 15, 2024
Co-authored-by: Guilherme Gazzo <[email protected]>
Co-authored-by: Matheus Barbosa Silva <[email protected]>
ggazzo added a commit that referenced this pull request Oct 17, 2024
Co-authored-by: Guilherme Gazzo <[email protected]>
Co-authored-by: Matheus Barbosa Silva <[email protected]>
ggazzo added a commit that referenced this pull request Oct 17, 2024
Co-authored-by: Guilherme Gazzo <[email protected]>
Co-authored-by: Matheus Barbosa Silva <[email protected]>
ggazzo added a commit that referenced this pull request Oct 17, 2024
Co-authored-by: Guilherme Gazzo <[email protected]>
Co-authored-by: Matheus Barbosa Silva <[email protected]>
This was referenced Oct 20, 2024
abhinavkrin pushed a commit that referenced this pull request Oct 25, 2024
Co-authored-by: Guilherme Gazzo <[email protected]>
Co-authored-by: Matheus Barbosa Silva <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants