diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-10 11:59:51 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-10 11:59:51 +0000 |
| commit | 6447db063a0d01135582bdfb3392b419f16a19e7 (patch) | |
| tree | 6f94306775c4344dd695e4b6bb64776ca94bd8de /synapse/handlers/federation.py | |
| parent | Notify users about invites. (diff) | |
| download | synapse-6447db063a0d01135582bdfb3392b419f16a19e7.tar.xz | |
Fix backfill to work. Add auth to backfill request
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 9a59fe94d2..00d10609b8 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -193,10 +193,7 @@ class FederationHandler(BaseHandler): dest, room_id, limit, - extremities=[ - self.pdu_codec.decode_event_id(e) - for e in extremities - ] + extremities=extremities, ) events = [] @@ -473,7 +470,10 @@ class FederationHandler(BaseHandler): @defer.inlineCallbacks @log_function - def on_backfill_request(self, context, pdu_list, limit): + def on_backfill_request(self, origin, context, pdu_list, limit): + in_room = yield self.auth.check_host_in_room(context, origin) + if not in_room: + raise AuthError(403, "Host not in room.") events = yield self.store.get_backfill_events( context, |