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: Handle encrypted pinned messages #32380

Merged
merged 13 commits into from
Jun 22, 2024
Merged

fix: Handle encrypted pinned messages #32380

merged 13 commits into from
Jun 22, 2024

Conversation

yash-rajpal
Copy link
Member

@yash-rajpal yash-rajpal commented May 7, 2024

Proposed changes (including videos or screenshots)

Decrypt encrypted pinned messages in E2EE channels.
Introducing a new message type - message_pinned_e2e for encrypted pinned messages. The messages with this type will be decrypted before being shown.

image

Issue(s)

Steps to test or reproduce

  • Create an encrypted channel
  • Send some message and pin it
  • The pinned message in chat looks like gibberish
  • The message in pinned messages tab isn't shown

Further comments

E2EE-14

Copy link
Contributor

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

🦋 Changeset detected

Latest commit: f72ff36

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/core-typings Patch
@rocket.chat/meteor 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/rest-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/uikit-playground Patch
@rocket.chat/models Patch
@rocket.chat/ddp-client 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

@yash-rajpal yash-rajpal marked this pull request as ready for review May 7, 2024 12:32
@yash-rajpal yash-rajpal requested review from a team as code owners May 7, 2024 12:32
@yash-rajpal yash-rajpal added this to the 6.9 milestone May 7, 2024
Copy link

codecov bot commented May 7, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 56.56%. Comparing base (161813c) to head (f72ff36).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32380      +/-   ##
===========================================
- Coverage    56.63%   56.56%   -0.07%     
===========================================
  Files         2495     2491       -4     
  Lines        55242    55041     -201     
  Branches     11435    11391      -44     
===========================================
- Hits         31284    31136     -148     
+ Misses       21261    21246      -15     
+ Partials      2697     2659      -38     
Flag Coverage Δ
unit 71.88% <ø> (+0.04%) ⬆️

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

.changeset/forty-bikes-check.md Outdated Show resolved Hide resolved
apps/meteor/app/e2e/client/rocketchat.e2e.ts Outdated Show resolved Hide resolved
apps/meteor/app/e2e/client/rocketchat.e2e.ts Outdated Show resolved Hide resolved
apps/meteor/app/e2e/client/rocketchat.e2e.ts Show resolved Hide resolved
apps/meteor/client/components/message/StatusIndicators.tsx Outdated Show resolved Hide resolved
apps/meteor/client/startup/e2e.ts Outdated Show resolved Hide resolved
@scuciatto scuciatto removed this from the 6.9 milestone May 21, 2024
@milton-rucks milton-rucks added this to the 6.10 milestone Jun 13, 2024
@milton-rucks milton-rucks added the stat: QA assured Means it has been tested and approved by a company insider label Jun 17, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jun 17, 2024
KevLehman
KevLehman previously approved these changes Jun 19, 2024
KevLehman
KevLehman previously approved these changes Jun 20, 2024
hugocostadev
hugocostadev previously approved these changes Jun 20, 2024
@yash-rajpal yash-rajpal added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels Jun 20, 2024
@ggazzo ggazzo dismissed stale reviews from hugocostadev and KevLehman via c647717 June 22, 2024 03:09
@ggazzo ggazzo merged commit 1240c87 into develop Jun 22, 2024
19 checks passed
@ggazzo ggazzo deleted the e2e-pinned-Messages branch June 22, 2024 14:07
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.

6 participants