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

Fix spec compliance issue around encrypted m.relates_to #3178

Merged
merged 2 commits into from
Feb 27, 2023
Merged

Fix spec compliance issue around encrypted m.relates_to #3178

merged 2 commits into from
Feb 27, 2023

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Feb 27, 2023 •
edited by github-actions bot
Loading

Requires matrix-org/matrix-react-sdk#10248

Warning: If an encrypted event contains an m.relates_to in its payload, it should be ignored and instead favour the cleartext m.relates_to copy (including when there is no cleartext copy). This is to ensure the client’s behaviour matches the server’s capability to handle relationships.

-- https://spec.matrix.org/v1.6/client-server-api/#forming-relationships-between-events

image

Here's what your changelog entry will look like:

🐛 Bug Fixes

  • Fix spec compliance issue around encrypted m.relates_to (#3178).

@t3chguy t3chguy marked this pull request as ready for review February 27, 2023 17:05
@t3chguy t3chguy requested a review from a team as a code owner February 27, 2023 17:05
@t3chguy t3chguy requested review from dbkr and richvdh February 27, 2023 17:05
germain-gg
germain-gg suggested changes Feb 27, 2023
View reviewed changes
Copy link
Contributor

@germain-gg germain-gg left a comment

Choose a reason for hiding this comment

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

Looks good to me! Thank you for fixing this
Seems to be a case where we'd benefit from adding a test

germain-gg
germain-gg approved these changes Feb 27, 2023
View reviewed changes
Copy link
Contributor

@germain-gg germain-gg left a comment

Choose a reason for hiding this comment

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

Thank you

@t3chguy t3chguy added this pull request to the merge queue Feb 27, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Feb 27, 2023
@t3chguy t3chguy added this pull request to the merge queue Feb 27, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Feb 27, 2023
@t3chguy t3chguy added this pull request to the merge queue Feb 27, 2023
Merged via the queue into develop with commit d80b749 Feb 27, 2023
@t3chguy t3chguy deleted the t3chguy/spec-compliance branch February 27, 2023 22:37
@t3chguy t3chguy mentioned this pull request Feb 27, 2023
Open
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Mar 15, 2023
@su-ex
Merge tag 'v23.4.0' into sc
0c0854b 
* Add easy way to determine if the decryption failure is due to "DecryptionError: The sender has disabled encrypting to unverified devices." ([\matrix-org#3167](matrix-org#3167)). Contributed by @florianduros.
* Polls: expose end event id on poll model ([\matrix-org#3160](matrix-org#3160)). Contributed by @kerryarchibald.
* Polls: count undecryptable poll relations ([\matrix-org#3163](matrix-org#3163)). Contributed by @kerryarchibald.
* Fix spec compliance issue around encrypted `m.relates_to` ([\matrix-org#3178](matrix-org#3178)).
* Fix reactions in threads sometimes causing stuck notifications ([\matrix-org#3146](matrix-org#3146)). Fixes element-hq/element-web#24000. Contributed by @justjanne.
* Better type guard parseTopicContent ([\matrix-org#3165](matrix-org#3165)). Fixes matrix-org/element-web-rageshakes#20177 and matrix-org/element-web-rageshakes#20178.
* Fix a bug where events in encrypted rooms would sometimes erroneously increment the total unread counter after being processed locally. ([\matrix-org#3130](matrix-org#3130)). Fixes element-hq/element-web#24448. Contributed by @Half-Shot.
* Stop the ICE disconnected timer on call terminate ([\matrix-org#3147](matrix-org#3147)).
* Clear notifications when we can infer read status from receipts ([\matrix-org#3139](matrix-org#3139)). Fixes element-hq/element-web#23991.
* Messages sent out of order after one message fails ([\matrix-org#3131](matrix-org#3131)). Fixes element-hq/element-web#22885 and element-hq/element-web#18942. Contributed by @justjanne.
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Mar 15, 2023
@su-ex
Merge tag 'v23.5.0' into sc
589938f 
* Implement MSC3758: a push rule condition to match event properties exactly ([\matrix-org#3179](matrix-org#3179)).
* Enable group calls without video and audio track by configuration of MatrixClient ([\matrix-org#3162](matrix-org#3162)). Contributed by @EnricoSchw.
* Updates to protocol used for Sign in with QR code ([\matrix-org#3155](matrix-org#3155)). Contributed by @hughns.
* Implement MSC3873 to handle escaped dots in push rule keys ([\matrix-org#3134](matrix-org#3134)). Fixes undefined/matrix-js-sdk#1454.
* Fix spec compliance issue around encrypted `m.relates_to` ([\matrix-org#3178](matrix-org#3178)).
* Fix reactions in threads sometimes causing stuck notifications ([\matrix-org#3146](matrix-org#3146)). Fixes element-hq/element-web#24000. Contributed by @justjanne.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@germain-gg germain-gg germain-gg approved these changes

@dbkr dbkr Awaiting requested review from dbkr dbkr is a code owner automatically assigned from matrix-org/element-web-reviewers

@richvdh richvdh Awaiting requested review from richvdh richvdh is a code owner automatically assigned from matrix-org/element-web-reviewers

Assignees
No one assigned
Labels
T-Defect
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@t3chguy @germain-gg