summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-09-18 11:07:05 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-09-18 12:07:16 +0100
commit3faa0974bea4f9a8b0d1e0e83ae7068e0937167d (patch)
treee8c0a09e9b7b336d29b078eb674427faafd02844
parentIntelligently select extremities used in backfill. (diff)
downloadsynapse-anoa/backfill_release.tar.xz
Use _check_sigs_and_hash_and_fetch to validate backfill requests github/anoa/backfill_release anoa/backfill_release
I believe this method drops pdus (or at least returns None instead) which allows backfill to continue
working even when an event has an invalid signature
-rw-r--r--synapse/federation/federation_client.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index a2e8d96ea2..e6388a2050 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -217,11 +217,8 @@ 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)
+        pdus[:] = await self._check_sigs_and_hash_and_fetch(
+            dest, pdus, outlier=True, room_version=room_version
         )
 
         return pdus