diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2021-03-23 10:53:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-23 10:53:05 +0000 |
| commit | 05ec9e8d37540711ef50e85e6f7bc5fa13ec8f55 (patch) | |
| tree | cae8a041d4847d5044bbea883ab8b075c403b1e5 /snap | |
| parent | Merge branch 'develop' into matrix-org-hotfixes (diff) | |
| download | synapse-05ec9e8d37540711ef50e85e6f7bc5fa13ec8f55.tar.xz | |
Revert "Patch to temporarily drop cross-user m.key_share_requests (#8675)" (#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 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](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 d60af9305a07fadcf0270d1887c5b7d063834967.
Diffstat (limited to 'snap')
0 files changed, 0 insertions, 0 deletions