From b6b67715edc496ea95fd8005ee5b5685adcf2601 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Wed, 4 Jan 2017 13:34:35 +0000 Subject: Send ALL membership events to the server that was affected. Send all membership changes to the server that was affected. This ensures that if the last member of a room on a server was kicked or banned they get told about it. --- synapse/federation/transaction_queue.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'synapse/federation/transaction_queue.py') diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index 51b656d74a..b00dda2908 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -19,7 +19,7 @@ from twisted.internet import defer from .persistence import TransactionActions from .units import Transaction, Edu -from synapse.api.constants import EventTypes, Membership +from synapse.api.constants import EventTypes from synapse.api.errors import HttpResponseException from synapse.util.async import run_on_reactor from synapse.util.logcontext import preserve_context_over_fn @@ -161,9 +161,11 @@ class TransactionQueue(object): get_domain_from_id(user_id) for user_id in users_in_room ) + # Send all membership changes to the server that was affected. + # This ensures that if the last member of a room on a server + # was kicked or banned they get told about it. if event.type == EventTypes.Member: - if event.content["membership"] == Membership.JOIN: - destinations.add(get_domain_from_id(event.state_key)) + destinations.add(get_domain_from_id(event.state_key)) logger.debug("Sending %s to %r", event, destinations) -- cgit 1.5.1 From e02bdaf08ba12a5c1ef15d721a7505ffd870c608 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Wed, 4 Jan 2017 15:13:40 +0000 Subject: Get the destinations from the state from before the event Rather than the state after then event. --- synapse/federation/transaction_queue.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'synapse/federation/transaction_queue.py') diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index b00dda2908..891c245bb4 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -19,7 +19,6 @@ from twisted.internet import defer from .persistence import TransactionActions from .units import Transaction, Edu -from synapse.api.constants import EventTypes from synapse.api.errors import HttpResponseException from synapse.util.async import run_on_reactor from synapse.util.logcontext import preserve_context_over_fn @@ -153,20 +152,22 @@ class TransactionQueue(object): break 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( - 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( get_domain_from_id(user_id) for user_id in users_in_room ) - # Send all membership changes to the server that was affected. - # This ensures that if the last member of a room on a server - # was kicked or banned they get told about it. - if event.type == EventTypes.Member: - destinations.add(get_domain_from_id(event.state_key)) - logger.debug("Sending %s to %r", event, destinations) self._send_pdu(event, destinations) -- cgit 1.5.1 From f784980d2b2bd3827bfef94b0360582b2ef228ba Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Thu, 5 Jan 2017 11:26:30 +0000 Subject: Only send events that originate on this server. Or events that are sent via the federation "send_join" API. This should match the behaviour from before v0.18.5 and #1635 landed. --- synapse/events/__init__.py | 9 +++++++++ synapse/federation/transaction_queue.py | 12 ++++++++++++ synapse/handlers/federation.py | 4 ++++ 3 files changed, 25 insertions(+) (limited to 'synapse/federation/transaction_queue.py') diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index bcb8f33a58..8c71aeb5e4 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -36,6 +36,15 @@ class _EventInternalMetadata(object): def is_invite_from_remote(self): return getattr(self, "invite_from_remote", False) + def get_send_on_behalf_of(self): + """Whether this server should send the event on behalf of another server. + This is used by the federation "send_join" API to forward the initial join + event for a server in the room. + + returns a str with the name of the server this event is sent on behalf of. + """ + return getattr(self, "get_send_on_behalf_of", None) + def _event_dict_property(key): def getter(self): diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index 891c245bb4..7db7b806dc 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -61,6 +61,7 @@ class TransactionQueue(object): self.transport_layer = hs.get_federation_transport_client() self.clock = hs.get_clock() + self.is_mine_id = hs.is_mine_id # Is a mapping from destinations -> deferreds. Used to keep track # of which destinations have transactions in flight and when they are @@ -152,6 +153,12 @@ class TransactionQueue(object): break for event in events: + # Only send events for this server. + send_on_behalf_of = event.internal_metadata.get_send_on_behalf_of() + is_mine = self.is_mine_id(event.event_id) + if not is_mine and send_on_behalf_of is None: + continue + # 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. @@ -167,6 +174,11 @@ class TransactionQueue(object): destinations = set( get_domain_from_id(user_id) for user_id in users_in_room ) + if send_on_behalf_of is not None: + # If we are sending the event on behalf of another server + # then it already has the event and there is no reason to + # send the event to it. + destinations.discard(send_on_behalf_of) logger.debug("Sending %s to %r", event, destinations) diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 1d07e4d02b..8c93d6d39f 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -790,6 +790,10 @@ class FederationHandler(BaseHandler): ) event.internal_metadata.outlier = False + # Send this event on behalf of the origin server since they may not + # have an up to data view of the state of the room at this event so + # will not know which servers to send the event to. + event.internal_metadata.send_on_behalf_of = origin context, event_stream_id, max_stream_id = yield self._handle_new_event( origin, event -- cgit 1.5.1