MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-16 03:03:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1758 from matrix-org/markjh/fix_ban_propagation

Browse source 
Fix propagation of bans to remote servers.
This commit is contained in:
Mark Haines 2017-01-04 15:39:31 +00:00 committed by GitHub
commit 0d766c8ccf
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
synapse/federation/transaction_queue.py
View file

@ -19,7 +19,6 @@ from twisted.internet import defer
from .persistence import TransactionActions from .persistence import TransactionActions
from .units import Transaction, Edu from .units import Transaction, Edu
from synapse.api.constants import EventTypes, Membership
from synapse.api.errors import HttpResponseException from synapse.api.errors import HttpResponseException
from synapse.util.async import run_on_reactor from synapse.util.async import run_on_reactor
from synapse.util.logcontext import preserve_context_over_fn from synapse.util.logcontext import preserve_context_over_fn
@ -153,18 +152,22 @@ class TransactionQueue(object):
break break
for event in events: for event in events:
# Get the state from before the event.
# We need to make sure that this is the state from before
# the event and not from after it.
# Otherwise if the last member on a server in a room is
# banned then it won't receive the event because it won't
# be in the room after the ban.
users_in_room = yield self.state.get_current_user_in_room( users_in_room = yield self.state.get_current_user_in_room(
event.room_id, latest_event_ids=[event.event_id], event.room_id, latest_event_ids=[
prev_id for prev_id, _ in event.prev_events
],
) )
destinations = set( destinations = set(
get_domain_from_id(user_id) for user_id in users_in_room get_domain_from_id(user_id) for user_id in users_in_room
) )
if event.type == EventTypes.Member:
if event.content["membership"] == Membership.JOIN:
destinations.add(get_domain_from_id(event.state_key))
logger.debug("Sending %s to %r", event, destinations) logger.debug("Sending %s to %r", event, destinations)
self._send_pdu(event, destinations) self._send_pdu(event, destinations)