Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Patch to temporarily drop cross-user m.key_share_requests #8675

Merged
merged 8 commits into from
Oct 28, 2020

Conversation

anoadragon453
Copy link
Member

@anoadragon453 anoadragon453 commented Oct 28, 2020

Cross-user m.key_share_requests are a relatively new to_device message that allows user to re-request session keys for a message from another user if they were otherwise unable to retrieve them.

Unfortunately, these have had performance concerns on matrix.org. This is a temporary patch to disable them while we investigate a better solution.

@anoadragon453 anoadragon453 merged commit d60af93 into matrix-org-hotfixes Oct 28, 2020
@anoadragon453 anoadragon453 deleted the anoa/drop_key_share_requests branch October 28, 2020 11:58
anoadragon453 added a commit that referenced this pull request Oct 28, 2020
Cross-user `m.key_share_requests` are a relatively new `to_device` message that allows user to re-request session keys for a message from another user if they were otherwise unable to retrieve them.

Unfortunately, these have had performance concerns on matrix.org. This is a temporary patch to disable them while we investigate a better solution.
anoadragon453 added a commit that referenced this pull request Mar 23, 2021
anoadragon453 added a commit that referenced this pull request Mar 23, 2021
)" (#9668)

We patched `matrix-org-hotfixes` a little while ago in #8675 to drop any cross-user key share requests while they were being accidentally spammed by a client. This was a temporary fix until we had some rate-limiting in place.

Rate-limiting landed in #8957. Note that the rate-limit can't be configured, but has what appear to be [sensible defaults](https://github.com/matrix-org/synapse/blob/db2efa9c50569adbfab102b1f447f5a8312b95f3/synapse/config/ratelimiting.py#L105-L113).

Note that the original patch was already actually overridden partially when the rate-limit PR landed, as they conflicted. So we've already lifted the restriction between local devices on matrix.org, but requests were still blocked from being sent over federation. This PR cleans up the remaining bits.

This reverts commit d60af93.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants