diff options
| author | Erik Johnston <erik@matrix.org> | 2022-06-06 11:24:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-06 09:24:12 +0100 |
| commit | e3163e2e11cf8bffa4cb3e58ac0b86a83eca314c (patch) | |
| tree | 639271e4b4d4157b95047f801f6b22bf39a24f08 /synapse/federation | |
| parent | Remove groups code from synapse_port_db. (#12899) (diff) | |
| download | synapse-e3163e2e11cf8bffa4cb3e58ac0b86a83eca314c.tar.xz | |
Reduce the amount of state we pull from the DB (#12811)
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_base.py | 1 | ||||
| -rw-r--r-- | synapse/federation/federation_server.py | 12 |
2 files changed, 5 insertions, 8 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py index a6232e048b..2522bf78fc 100644 --- a/synapse/federation/federation_base.py +++ b/synapse/federation/federation_base.py @@ -53,6 +53,7 @@ class FederationBase: self.spam_checker = hs.get_spam_checker() self.store = hs.get_datastores().main self._clock = hs.get_clock() + self._storage_controllers = hs.get_storage_controllers() async def _check_sigs_and_hash( self, room_version: RoomVersion, pdu: EventBase diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index f4af121c4d..3e1518f1f6 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -1223,14 +1223,10 @@ class FederationServer(FederationBase): Raises: AuthError if the server does not match the ACL """ - state_ids = await self._state_storage_controller.get_current_state_ids(room_id) - acl_event_id = state_ids.get((EventTypes.ServerACL, "")) - - if not acl_event_id: - return - - acl_event = await self.store.get_event(acl_event_id) - if server_matches_acl_event(server_name, acl_event): + acl_event = await self._storage_controllers.state.get_current_state_event( + room_id, EventTypes.ServerACL, "" + ) + if not acl_event or server_matches_acl_event(server_name, acl_event): return raise AuthError(code=403, msg="Server is banned from room") |