diff options
author | Erik Johnston <erikj@jki.re> | 2016-08-04 14:38:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-04 14:38:59 +0100 |
commit | 1b5436ad782218bb7c31958ff5939a1458d39b4d (patch) | |
tree | 966b68430857e3fe505f4dcc285bb07c850963c3 /synapse/federation/federation_server.py | |
parent | Merge pull request #982 from matrix-org/erikj/fix_port_script (diff) | |
parent | Fix typos. (diff) | |
download | synapse-1b5436ad782218bb7c31958ff5939a1458d39b4d.tar.xz |
Merge pull request #979 from matrix-org/erikj/state_ids_api
Add /state_ids federation API
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r-- | synapse/federation/federation_server.py | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 8ec5b190c8..aba19639c7 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -215,6 +215,27 @@ class FederationServer(FederationBase): defer.returnValue((200, resp)) @defer.inlineCallbacks + def on_state_ids_request(self, origin, room_id, event_id): + if not event_id: + raise NotImplementedError("Specify an event") + + in_room = yield self.auth.check_host_in_room(room_id, origin) + if not in_room: + raise AuthError(403, "Host not in room.") + + pdus = yield self.handler.get_state_for_pdu( + room_id, event_id, + ) + auth_chain = yield self.store.get_auth_chain( + [pdu.event_id for pdu in pdus] + ) + + defer.returnValue((200, { + "pdu_ids": [pdu.event_id for pdu in pdus], + "auth_chain_ids": [pdu.event_id for pdu in auth_chain], + })) + + @defer.inlineCallbacks def _on_context_state_request_compute(self, room_id, event_id): pdus = yield self.handler.get_state_for_pdu( room_id, event_id, @@ -584,7 +605,7 @@ class FederationServer(FederationBase): origin, pdu.room_id, pdu.event_id, ) except: - logger.warn("Failed to get state for event: %s", pdu.event_id) + logger.exception("Failed to get state for event: %s", pdu.event_id) yield self.handler.on_receive_pdu( origin, |