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: Enable encryption for direct/private rooms by default is overriding E2EE setting #32624

Merged
merged 5 commits into from
Jun 19, 2024

Conversation

yash-rajpal
Copy link
Member

@yash-rajpal yash-rajpal commented Jun 18, 2024

Proposed changes (including videos or screenshots)

We have a setting to force creation of new private groups as encrypted rooms. This setting was being applied even when the entire e2ee feature was disabled. We should not apply this setting when the feature is not enabled. So checking if the E2EE feature is enabled before applying this setting

Issue(s)

Steps to test or reproduce

Further comments

E2EE2-29

Copy link

changeset-bot bot commented Jun 18, 2024

🦋 Changeset detected

Latest commit: 3cc5f0a

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

This PR includes changesets to release 32 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron 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/api-client Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/ddp-client Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf 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

dionisio-bot bot commented Jun 18, 2024

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

@yash-rajpal yash-rajpal marked this pull request as ready for review June 18, 2024 17:37
@yash-rajpal yash-rajpal requested a review from a team as a code owner June 18, 2024 17:37
Copy link

codecov bot commented Jun 18, 2024

Codecov Report

Attention: Patch coverage is 0% with 1 line in your changes missing coverage. Please review.

Project coverage is 55.96%. Comparing base (f5e0d1e) to head (3cc5f0a).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32624      +/-   ##
===========================================
- Coverage    56.54%   55.96%   -0.59%     
===========================================
  Files         2484     2421      -63     
  Lines        54743    53600    -1143     
  Branches     11305    11036     -269     
===========================================
- Hits         30955    29997     -958     
+ Misses       21106    20979     -127     
+ Partials      2682     2624      -58     
Flag Coverage Δ
e2e 55.06% <0.00%> (-1.15%) ⬇️
unit 72.24% <ø> (+0.09%) ⬆️

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

@tassoevan tassoevan added the stat: QA assured Means it has been tested and approved by a company insider label Jun 19, 2024
@yash-rajpal yash-rajpal added this to the 6.10 milestone Jun 19, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jun 19, 2024
@kodiakhq kodiakhq bot merged commit cd97aac into develop Jun 19, 2024
44 of 48 checks passed
@kodiakhq kodiakhq bot deleted the e2ee2-29 branch June 19, 2024 21:50
This was referenced Jun 22, 2024
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.

2 participants