Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 3de9eb3

Browse files
committed
Merge commit 'd5f7182ba' into anoa/dinsic_release_1_21_x
* commit 'd5f7182ba': 1.20.0rc5 1.19.3 Use _check_sigs_and_hash_and_fetch to validate backfill requests (#8350)
2 parents 70783a3 + d5f7182 commit 3de9eb3

File tree

8 files changed

+41
-10
lines changed

8 files changed

+41
-10
lines changed

CHANGES.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
Synapse 1.20.0rc5 (2020-09-18)
2+
==============================
3+
4+
Features
5+
--------
6+
7+
- Add flags to the `/versions` endpoint that includes whether new rooms default to using E2EE. ([\#8343](https://github.com/matrix-org/synapse/issues/8343))
8+
9+
10+
Bugfixes
11+
--------
12+
13+
- Fix ratelimitng of federation `/send` requests. ([\#8342](https://github.com/matrix-org/synapse/issues/8342))
14+
- 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))
15+
16+
17+
Internal Changes
18+
----------------
19+
20+
- 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))
21+
22+
23+
Synapse 1.19.3 (2020-09-18)
24+
===========================
25+
26+
Bugfixes
27+
--------
28+
29+
- 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))
30+
31+
132
Synapse 1.20.0rc4 (2020-09-16)
233
==============================
334

changelog.d/8285.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/8342.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/8343.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/8349.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ matrix-synapse-py3 (1.20.0ubuntu1) UNRELEASED; urgency=medium
44

55
-- Dexter Chua <[email protected]> Wed, 26 Aug 2020 12:41:36 +0000
66

7+
matrix-synapse-py3 (1.19.3) stable; urgency=medium
8+
9+
* New synapse release 1.19.3.
10+
11+
-- Synapse Packaging team <[email protected]> Fri, 18 Sep 2020 14:59:30 +0100
12+
713
matrix-synapse-py3 (1.19.2) stable; urgency=medium
814

915
* New synapse release 1.19.2.

synapse/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
except ImportError:
4949
pass
5050

51-
__version__ = "1.20.0rc4"
51+
__version__ = "1.20.0rc5"
5252

5353
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
5454
# We import here so that we don't have to install a bunch of deps when

synapse/federation/federation_client.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,9 @@ async def backfill(
217217
for p in transaction_data["pdus"]
218218
]
219219

220-
# FIXME: We should handle signature failures more gracefully.
221-
pdus[:] = await make_deferred_yieldable(
222-
defer.gatherResults(
223-
self._check_sigs_and_hashes(room_version, pdus), consumeErrors=True,
224-
).addErrback(unwrapFirstError)
220+
# Check signatures and hash of pdus, removing any from the list that fail checks
221+
pdus[:] = await self._check_sigs_and_hash_and_fetch(
222+
dest, pdus, outlier=True, room_version=room_version
225223
)
226224

227225
return pdus

0 commit comments

Comments
 (0)