diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2020-09-18 11:17:58 -0400 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2020-09-18 11:17:58 -0400 |
| commit | 00db7786de526edc9635f6a5d12f725c31d2f3f5 (patch) | |
| tree | a270513d2f7e18cad96ae328e703490b89b878fb /synapse/federation | |
| parent | Admin API for querying rooms where a user is a member (#8306) (diff) | |
| parent | Add a note about including the changes from 1.19.3. (diff) | |
| download | synapse-00db7786de526edc9635f6a5d12f725c31d2f3f5.tar.xz | |
Merge tag 'v1.20.0rc5' into develop
Synapse 1.20.0rc5 (2020-09-18) ============================== In addition to the below, Synapse 1.20.0rc5 also includes the bug fix that was included in 1.19.3. Features -------- - Add flags to the `/versions` endpoint for whether new rooms default to using E2EE. ([\#8343](https://github.com/matrix-org/synapse/issues/8343)) Bugfixes -------- - Fix rate limiting of federation `/send` requests. ([\#8342](https://github.com/matrix-org/synapse/issues/8342)) - Fix a longstanding bug where back pagination over federation could get stuck if it failed to handle a received event. ([\#8349](https://github.com/matrix-org/synapse/issues/8349)) Internal Changes ---------------- - Blacklist [MSC2753](https://github.com/matrix-org/matrix-doc/pull/2753) SyTests until it is implemented. ([\#8285](https://github.com/matrix-org/synapse/issues/8285))
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_client.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index 639d19f696..688d43fffb 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 |