Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-08 05:12:18 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug where people could join private rooms

Browse source
This commit is contained in:
Erik Johnston 2014-10-17 19:37:41 +01:00
parent 5ffe5ab43f
commit b3b1961496
3 changed files with 63 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

10
synapse/handlers/federation.py
View file

@ -269,12 +269,12 @@ class FederationHandler(BaseHandler):
del self.room_queues[room_id]
for p in room_queue:
p.outlier = True
yield self.on_receive_pdu(p, backfilled=False)
defer.returnValue(True)
@defer.inlineCallbacks
@log_function
def on_make_join_request(self, context, user_id):
event = self.event_factory.create_event(
etype=RoomMemberEvent.TYPE,
@ -289,15 +289,21 @@ class FederationHandler(BaseHandler):
)
snapshot.fill_out_prev_events(event)
yield self.state_handler.annotate_state_groups(event)
yield self.auth.check(event, None, raises=True)
pdu = self.pdu_codec.pdu_from_event(event)
defer.returnValue(pdu)
@defer.inlineCallbacks
@log_function
def on_send_join_request(self, origin, pdu):
event = self.pdu_codec.event_from_pdu(pdu)
is_new_state= yield self.state_handler.annotate_state_groups(event)
event.outlier = False
is_new_state = yield self.state_handler.annotate_state_groups(event)
yield self.auth.check(event, None, raises=True)
# FIXME (erikj): All this is duplicated above :(