summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-08-02 15:21:37 +0100
committerGitHub <noreply@github.com>2016-08-02 15:21:37 +0100
commit7b0f6293f27c52194d86c3944a590d096e024f1b (patch)
treeebc1480decfa0f4063ec74628ae8e01bb84b5fc3 /synapse/handlers/federation.py
parentPrint authorization header for federation_client.py (diff)
parentCache federation state responses (diff)
downloadsynapse-7b0f6293f27c52194d86c3944a590d096e024f1b.tar.xz
Merge pull request #940 from matrix-org/erikj/fed_state_cache
Cache federation state responses
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index 1323235b62..187bfc4315 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py
@@ -991,14 +991,9 @@ class FederationHandler(BaseHandler): defer.returnValue(None) @defer.inlineCallbacks - def get_state_for_pdu(self, origin, room_id, event_id, do_auth=True): + def get_state_for_pdu(self, room_id, event_id): yield run_on_reactor() - if do_auth: - in_room = yield self.auth.check_host_in_room(room_id, origin) - if not in_room: - raise AuthError(403, "Host not in room.") - state_groups = yield self.store.get_state_groups( room_id, [event_id] )