summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2020-09-18 10:53:01 -0400
committerPatrick Cloke <patrickc@matrix.org>2020-09-18 10:53:01 -0400
commit88e67d1adb3d63e99cfb7657c319b163a76c9bae (patch)
tree5ea8b2b32ab3fee7d70e1e53bef6bddba8945209 /synapse
parentIntelligently select extremities used in backfill. (#8349) (diff)
parent1.19.3 (diff)
downloadsynapse-88e67d1adb3d63e99cfb7657c319b163a76c9bae.tar.xz
Merge tag 'v1.19.3' into release-v1.20.0
1.19.3

Synapse 1.19.3 (2020-09-18)
===========================

Bugfixes
--------

- Partially mitigate bug where newly joined servers couldn't get past
events in a room when there is a malformed event.
([\#8350](https://github.com/matrix-org/synapse/issues/8350))
Diffstat (limited to 'synapse')
-rw-r--r--synapse/federation/federation_client.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index a2e8d96ea2..d42930d1b9 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -217,11 +217,9 @@ class FederationClient(FederationBase):
             for p in transaction_data["pdus"]
         ]
 
-        # FIXME: We should handle signature failures more gracefully.
-        pdus[:] = await make_deferred_yieldable(
-            defer.gatherResults(
-                self._check_sigs_and_hashes(room_version, pdus), consumeErrors=True,
-            ).addErrback(unwrapFirstError)
+        # Check signatures and hash of pdus, removing any from the list that fail checks
+        pdus[:] = await self._check_sigs_and_hash_and_fetch(
+            dest, pdus, outlier=True, room_version=room_version
         )
 
         return pdus