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: prevent OTR in E2EE #32459

Merged
merged 8 commits into from
Jun 13, 2024
Merged

fix: prevent OTR in E2EE #32459

merged 8 commits into from
Jun 13, 2024

Conversation

hugocostadev
Copy link
Contributor

Proposed changes (including videos or screenshots)

Attempting to use OTR and E2E at the same time just renders a harsh.

Issue(s)

Steps to test or reproduce

  1. Enable E2E for a direct message channel
  2. Assemble an OTR session
  3. Try to send a message

Further comments

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

@hugocostadev hugocostadev requested a review from a team as a code owner May 20, 2024 19:43
Copy link
Contributor

dionisio-bot bot commented May 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 May 20, 2024

🦋 Changeset detected

Latest commit: dceeeac

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

This PR includes changesets to release 34 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/i18n Patch
@rocket.chat/mock-providers Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/ui-client Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript 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/model-typings Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service 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/models 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

@hugocostadev hugocostadev added this to the 7.0 milestone May 20, 2024
Copy link

codecov bot commented May 20, 2024

Codecov Report

Attention: Patch coverage is 90.32258% with 3 lines in your changes missing coverage. Please review.

Project coverage is 56.43%. Comparing base (4afd41c) to head (dceeeac).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32459      +/-   ##
===========================================
+ Coverage    54.36%   56.43%   +2.06%     
===========================================
  Files         2261     2452     +191     
  Lines        51062    54063    +3001     
  Branches     10492    11142     +650     
===========================================
+ Hits         27762    30509    +2747     
- Misses       20799    20897      +98     
- Partials      2501     2657     +156     
Flag Coverage Δ
e2e 56.18% <72.72%> (+3.99%) ⬆️
unit 71.92% <100.00%> (+0.08%) ⬆️

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

Copy link
Member

@MarcosSpessatto MarcosSpessatto left a comment

Choose a reason for hiding this comment

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

Would it be possible to add some UI tests to ensure the behavior?

@KevLehman
Copy link
Contributor

Random question from my ignorance: if the action is not allowed, shouldn't we at least gray out the button so users cannot click? 🤔
(nt sure if u are already doing it and i cannot see)

@hugocostadev
Copy link
Contributor Author

Random question from my ignorance: if the action is not allowed, shouldn't we at least gray out the button so users cannot click? 🤔

(nt sure if u are already doing it and i cannot see)

We have a similar scenario for Auto translate feature, so we decided (product and design) to do the same

@milton-rucks milton-rucks added the stat: QA assured Means it has been tested and approved by a company insider label Jun 11, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jun 11, 2024
@milton-rucks milton-rucks modified the milestones: 7.0, 6.10 Jun 11, 2024
@kodiakhq kodiakhq bot merged commit 1056f22 into develop Jun 13, 2024
47 of 48 checks passed
@kodiakhq kodiakhq bot deleted the fix/OTR_in_E2EE branch June 13, 2024 13: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.

5 participants