summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-03-23 10:24:03 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2021-03-23 10:24:03 +0000
commit6557eba7dc63e50e81c07805770a09ac856233b0 (patch)
treecae8a041d4847d5044bbea883ab8b075c403b1e5
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
downloadsynapse-6557eba7dc63e50e81c07805770a09ac856233b0.tar.xz
Revert "Patch to temporarily drop cross-user m.key_share_requests (#8675)"
This reverts commit d60af9305a07fadcf0270d1887c5b7d063834967.
-rw-r--r--changelog.d/8675.misc1
-rw-r--r--synapse/federation/federation_server.py4
2 files changed, 0 insertions, 5 deletions
diff --git a/changelog.d/8675.misc b/changelog.d/8675.misc
deleted file mode 100644

index 7ffe38b7d9..0000000000 --- a/changelog.d/8675.misc +++ /dev/null
@@ -1 +0,0 @@ -Temporarily drop cross-user m.room_key_request to_device messages over performance concerns. diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index 98caf2a1a4..9839d3d016 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py
@@ -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: