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.

Sign up for GitHub

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

Jump to bottom

Encryption should not hinder verification #2734

Merged
merged 8 commits into from
Oct 18, 2022
Merged

Encryption should not hinder verification #2734

merged 8 commits into from
Oct 18, 2022

Conversation

BillCarsonFr
Copy link
Member

@BillCarsonFr BillCarsonFr commented Oct 5, 2022 •
edited
Loading

Fixes #13656

Verification events sent in e2ee rooms should bypass the encrypt to verified devices only option. If not it renders verification impossible.

As per spec:

When using in-room messages and the room has encryption enabled, clients should ensure that encryption does not hinder the verification. For example, if the verification messages are encrypted, clients must ensure that all the recipient’s unverified devices receive the keys necessary to decrypt the messages, even if they would normally not be given the keys to decrypt messages in the room. Alternatively, verification messages may be sent unencrypted, though this is not encouraged.

Checklist

  • Tests written for new code (and old code if feasible)
  • Linter and other CI checks pass
  • Sign-off given on the changes (see CONTRIBUTING.md)

Here's what your changelog entry will look like:

🐛 Bug Fixes

  • Encryption should not hinder verification (#2734).

@BillCarsonFr BillCarsonFr force-pushed the bca/e2ee_hinders_verif branch from 4248358 to 3ec8058 Compare October 5, 2022 08:35
@BillCarsonFr BillCarsonFr marked this pull request as ready for review October 5, 2022 08:39
@BillCarsonFr BillCarsonFr requested a review from a team as a code owner October 5, 2022 08:39
@duxovni duxovni requested a review from SimonBrandner October 15, 2022 05:54
@duxovni
Copy link
Contributor

duxovni commented Oct 15, 2022

(Mostly looking for a quick reality-check on 8d29d5f)

SimonBrandner
SimonBrandner approved these changes Oct 15, 2022
View reviewed changes
Copy link
Contributor

@SimonBrandner SimonBrandner left a comment

Choose a reason for hiding this comment

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

Looks like an E2EE thing

@duxovni duxovni merged commit 1c3dd0e into matrix-org:develop Oct 18, 2022
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Nov 12, 2022
@su-ex
Merge tag 'v21.1.0' into sc
1474204 
* Loading threads with server-side assistance ([\matrix-org#2735](matrix-org#2735)). Contributed by @justjanne.
* Support sign in + E2EE set up using QR code implementing MSC3886, MSC3903 and MSC3906 ([\matrix-org#2747](matrix-org#2747)). Contributed by @hughns.
* Replace `instanceof Array` with `Array.isArray` ([\matrix-org#2812](matrix-org#2812)). Fixes matrix-org#2811.
* Emit UnreadNotification event on notifications reset ([\matrix-org#2804](matrix-org#2804)). Fixes element-hq/element-web#23590.
* Fix incorrect prevEv being sent in ClientEvent.AccountData events ([\matrix-org#2794](matrix-org#2794)).
* Fix build error caused by wrong ts-strict improvements ([\matrix-org#2783](matrix-org#2783)). Contributed by @justjanne.
* Encryption should not hinder verification ([\matrix-org#2734](matrix-org#2734)).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SimonBrandner SimonBrandner SimonBrandner approved these changes

Assignees
No one assigned
Labels
T-Defect
Projects
None yet
Milestone
No milestone
3 participants
@BillCarsonFr @duxovni @SimonBrandner