diff options
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/federation/federation_server.py | 24 | ||||
| -rw-r--r-- | synapse/state.py | 2 |
3 files changed, 25 insertions, 3 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 92690a48ac..91e3a2c2e0 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.18.6" +__version__ = "0.18.7-rc1" diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 800f04189f..5f6e6cbb42 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -23,6 +23,7 @@ from synapse.util.async import Linearizer from synapse.util.logutils import log_function from synapse.util.caches.response_cache import ResponseCache from synapse.events import FrozenEvent +from synapse.types import get_domain_from_id import synapse.metrics from synapse.api.errors import AuthError, FederationError, SynapseError @@ -132,7 +133,7 @@ class FederationServer(FederationBase): if response: logger.debug( - "[%s] We've already responed to this request", + "[%s] We've already responded to this request", transaction.transaction_id ) defer.returnValue(response) @@ -475,6 +476,27 @@ class FederationServer(FederationBase): @defer.inlineCallbacks @log_function def _handle_new_pdu(self, origin, pdu, get_missing=True): + + # check that it's actually being sent from a valid destination to + # workaround bug #1753 in 0.18.5 and 0.18.6 + if origin != get_domain_from_id(pdu.event_id): + if not ( + pdu.type == 'm.room.member' and + pdu.content and + pdu.content.get("membership", None) == 'join' and + self.hs.is_mine_id(pdu.state_key) + ): + logger.info( + "Discarding PDU %s from invalid origin %s", + pdu.event_id, origin + ) + return + else: + logger.info( + "Accepting join PDU %s from %s", + pdu.event_id, origin + ) + # We reprocess pdus when we have seen them only as outliers existing = yield self._get_persisted_pdu( origin, pdu.event_id, do_auth=False diff --git a/synapse/state.py b/synapse/state.py index ba0d2a39ac..8003099c88 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -160,9 +160,9 @@ class StateHandler(object): @defer.inlineCallbacks def get_current_user_in_room(self, room_id, latest_event_ids=None): - logger.info("calling resolve_state_groups from get_current_user_in_room") if not latest_event_ids: latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id) + logger.info("calling resolve_state_groups from get_current_user_in_room") entry = yield self.resolve_state_groups(room_id, latest_event_ids) joined_users = yield self.store.get_joined_users_from_state( room_id, entry.state_id, entry.state |