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

[IMPROVE] Require acceptance when setting new E2E Encryption key for another user #27556

Merged
merged 15 commits into from Jan 16, 2023

Conversation

rodrigok
Copy link
Member

@rodrigok rodrigok commented Dec 15, 2022

Proposed changes (including videos or screenshots)

Change the end to end encryption flow to require an acceptance from the user when receiving a new key.

  1. Changes API e2e.updateGroupKey to set the new key to an auxiliary property named E2ESuggestedKey
  2. Adds new API e2e.acceptSuggestedGroupKey to be called to accept the suggested key and save it to the final property E2EKey
  3. Adds new API e2e.rejectSuggestedGroupKey to be called to reject the suggested key and clear the E2ESuggestedKey

Issue(s)

Steps to test or reproduce

Further comments

@rodrigok rodrigok requested a review from a team as a code owner December 15, 2022 18:07
@rodrigok rodrigok changed the title [BREAK] Require acceptance when setting new E2E Encryption key for other user [IMPROVE] Require acceptance when setting new E2E Encryption key for another user Dec 15, 2022
@rodrigok rodrigok marked this pull request as draft December 15, 2022 18:13
@codecov
Copy link

codecov bot commented Dec 15, 2022

Codecov Report

Merging #27556 (9ea3da7) into develop (0c53e9d) will increase coverage by 0.04%.
The diff coverage is 33.33%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #27556      +/-   ##
===========================================
+ Coverage    41.97%   42.01%   +0.04%     
===========================================
  Files          841      841              
  Lines        17706    17716      +10     
  Branches      1996     1998       +2     
===========================================
+ Hits          7432     7444      +12     
  Misses       10016    10016              
+ Partials       258      256       -2     
Flag Coverage Δ
e2e 42.01% <33.33%> (+0.04%) ⬆️

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

@rodrigok rodrigok marked this pull request as ready for review December 23, 2022 18:33
@rodrigok rodrigok requested a review from a team as a code owner December 23, 2022 18:33
@rodrigok rodrigok added this to the 6.0.0 milestone Dec 23, 2022
diegolmello
diegolmello previously approved these changes Jan 4, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: needs QA labels Jan 10, 2023
@LevyCosta LevyCosta removed the stat: ready to merge PR tested and approved waiting for merge label Jan 10, 2023
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jan 10, 2023
@kodiakhq kodiakhq bot merged commit f48eff8 into develop Jan 16, 2023
@kodiakhq kodiakhq bot deleted the e2ee-key-accept branch January 16, 2023 13:33
gabriellsh added a commit that referenced this pull request Jan 16, 2023
…ixSearch

* 'develop' of github.com:RocketChat/Rocket.Chat:
  Chore: Show different labels based on the call originator on direct calls (#27729)
  Chore: Change bundle tags color and refactor app details page header styles (#27293)
  [FIX] Auto Translate not working on new message template (#27317)
  Chore: Custom Sounds Empty State (#27632)
  [IMPROVE] Require acceptance when setting new E2E Encryption key for another user (#27556)
  Regression: Broken room and message composer events (#27754)
  [FIX] Missing placeholders from encrypted channel preview messages now with expected behavior (#27699)
  [IMPROVE] SAML and OAuth role sync to support id and name (#27405)
  Chore: add e2e test coverage for Video Conference (#27075)
  Chore: Invites Empty State (#27631)
  [FIX] Marketplace app status initially disabled (#27330)
  Regression: Missing contexts on contextual bar (#27734)
@sampaiodiego sampaiodiego mentioned this pull request Feb 17, 2023
@sampaiodiego sampaiodiego mentioned this pull request Mar 9, 2023
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA tested stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants