maxmustermann/synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Patch to temporarily drop cross-user m.key_share_requests (#8675)" (#9668)

Browse source 
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 https://github.com/matrix-org/synapse/pull/8957. Note that the rate-limit can't be configured, but has what appear to be [sensible defaults](db2efa9c50/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 d60af9305a.
This commit is contained in:
Andrew Morgan 2021-03-23 10:53:05 +00:00 committed by GitHub
parent d8953b34f2
commit 05ec9e8d37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/8675.misc
View file

@ -1 +0,0 @@
Temporarily drop cross-user m.room_key_request to_device messages over performance concerns.

4
synapse/federation/federation_server.py
View file

@ -955,10 +955,6 @@ class FederationHandlerRegistry:
):
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: