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

fix: Allow any user in e2ee room to create and propagate room keys #34038

Merged
merged 3 commits into from
Dec 6, 2024

Conversation

KevLehman
Copy link
Contributor

@KevLehman KevLehman commented Nov 22, 2024

Proposed changes (including videos or screenshots)

Issue(s)

https://rocketchat.atlassian.net/browse/CORE-822

Steps to test or reproduce

Further comments

Copy link
Contributor

dionisio-bot bot commented Nov 22, 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 Nov 22, 2024

🦋 Changeset detected

Latest commit: 2fff08f

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

This PR includes changesets to release 35 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/api-client Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/ddp-client Patch
@rocket.chat/freeswitch Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@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/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/network-broker Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/ui-voip Patch
@rocket.chat/web-ui-registration Patch
@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 Nov 22, 2024

PR Preview Action v1.4.8
🚀 Deployed preview to https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-34038/
on branch gh-pages at 2024-12-06 19:56 UTC

Copy link

codecov bot commented Nov 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.79%. Comparing base (211c10d) to head (2fff08f).
Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff            @@
##           develop   #34038   +/-   ##
========================================
  Coverage    75.79%   75.79%           
========================================
  Files          511      511           
  Lines        22130    22130           
  Branches      5394     5394           
========================================
  Hits         16773    16773           
  Misses        4709     4709           
  Partials       648      648           
Flag Coverage Δ
unit 75.79% <ø> (ø)

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

@KevLehman KevLehman marked this pull request as ready for review November 25, 2024 15:00
@MarcosSpessatto MarcosSpessatto added this to the 7.2.0 milestone Nov 25, 2024
@RocketChat RocketChat deleted a comment from dionisio-bot bot Nov 26, 2024
@jessicaschelly jessicaschelly added the stat: QA assured Means it has been tested and approved by a company insider label Dec 5, 2024
@KevLehman KevLehman added the stat: ready to merge PR tested and approved waiting for merge label Dec 6, 2024
@dionisio-bot dionisio-bot bot removed the stat: ready to merge PR tested and approved waiting for merge label Dec 6, 2024
@KevLehman KevLehman added the stat: ready to merge PR tested and approved waiting for merge label Dec 6, 2024
@kodiakhq kodiakhq bot merged commit d569f26 into develop Dec 6, 2024
51 checks passed
@kodiakhq kodiakhq bot deleted the fix/e2e-anyone-creates-keys branch December 6, 2024 21:06
@scuciatto
Copy link
Member

/backport 7.0.1

Copy link
Contributor

dionisio-bot bot commented Dec 9, 2024

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-7.0.1-34038
git cherry-pick d569f26fa4567adf1bb148c83b1a459596834694
// solve the conflict
git push

after that just run /backport 7.0.1 again

@KevLehman
Copy link
Contributor Author

/backport 7.0.1

1 similar comment
@scuciatto
Copy link
Member

/backport 7.0.1

Copy link
Contributor

dionisio-bot bot commented Dec 9, 2024

Pull request #34152 added to Project: "Patch 7.0.1"

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.

4 participants