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

Commit

Permalink
Revert "Patch to temporarily drop cross-user m.key_share_requests (#8675
Browse files Browse the repository at this point in the history
)" (#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.
  • Loading branch information
anoadragon453 authored Mar 23, 2021
1 parent d8953b3 commit 05ec9e8
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
1 change: 0 additions & 1 deletion changelog.d/8675.misc

This file was deleted.

4 changes: 0 additions & 4 deletions synapse/federation/federation_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -955,10 +955,6 @@ async def on_edu(self, edu_type: str, origin: str, content: dict):
):
return

# Temporary patch to drop cross-user key share requests
if edu_type == "m.room_key_request":
return

# Check if we have a handler on this instance
handler = self.edu_handlers.get(edu_type)
if handler:
Expand Down

0 comments on commit 05ec9e8

Please sign in to comment.