From 2dc9468c27884540afdaf51bf56f43e38b8e1f8e Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Tue, 9 Jun 2020 16:34:37 +0100
Subject: [PATCH] Revert "1.15.0rc1"

This reverts commit 8587b0426fa4e65992aaa47158e991fa1797d3fb.
---
 CHANGES.md               | 66 ----------------------------------------
 changelog.d/6585.feature |  1 +
 changelog.d/6637.feature |  1 +
 changelog.d/7263.bugfix  |  1 +
 changelog.d/7267.bugfix  |  1 +
 changelog.d/7385.feature |  1 +
 changelog.d/7481.feature |  1 +
 changelog.d/7561.misc    |  1 +
 changelog.d/7567.misc    |  1 +
 changelog.d/7575.bugfix  |  1 +
 changelog.d/7584.misc    |  1 +
 changelog.d/7585.bugfix  |  1 +
 changelog.d/7586.feature |  1 +
 changelog.d/7587.doc     |  1 +
 changelog.d/7591.misc    |  1 +
 changelog.d/7594.bugfix  |  1 +
 changelog.d/7595.misc    |  1 +
 changelog.d/7597.bugfix  |  1 +
 changelog.d/7599.bugfix  |  1 +
 changelog.d/7600.misc    |  1 +
 changelog.d/7602.doc     |  1 +
 changelog.d/7603.doc     |  1 +
 changelog.d/7607.bugfix  |  1 +
 changelog.d/7609.bugfix  |  1 +
 changelog.d/7614.misc    |  1 +
 changelog.d/7619.misc    |  1 +
 changelog.d/7620.misc    |  1 +
 changelog.d/7621.misc    |  1 +
 changelog.d/7622.bugfix  |  1 +
 changelog.d/7623.misc    |  1 +
 changelog.d/7624.bugfix  |  1 +
 changelog.d/7625.misc    |  1 +
 changelog.d/7628.misc    |  1 +
 changelog.d/7629.bugfix  |  1 +
 changelog.d/7630.feature |  1 +
 changelog.d/7631.bugfix  |  1 +
 changelog.d/7634.misc    |  1 +
 changelog.d/7637.misc    |  1 +
 changelog.d/7640.misc    |  1 +
 changelog.d/7644.misc    |  1 +
 changelog.d/7645.misc    |  1 +
 changelog.d/7647.doc     |  1 +
 changelog.d/7649.misc    |  1 +
 changelog.d/7656.bugfix  |  1 +
 synapse/__init__.py      |  2 +-
 45 files changed, 44 insertions(+), 67 deletions(-)
 create mode 100644 changelog.d/6585.feature
 create mode 100644 changelog.d/6637.feature
 create mode 100644 changelog.d/7263.bugfix
 create mode 100644 changelog.d/7267.bugfix
 create mode 100644 changelog.d/7385.feature
 create mode 100644 changelog.d/7481.feature
 create mode 100644 changelog.d/7561.misc
 create mode 100644 changelog.d/7567.misc
 create mode 100644 changelog.d/7575.bugfix
 create mode 100644 changelog.d/7584.misc
 create mode 100644 changelog.d/7585.bugfix
 create mode 100644 changelog.d/7586.feature
 create mode 100644 changelog.d/7587.doc
 create mode 100644 changelog.d/7591.misc
 create mode 100644 changelog.d/7594.bugfix
 create mode 100644 changelog.d/7595.misc
 create mode 100644 changelog.d/7597.bugfix
 create mode 100644 changelog.d/7599.bugfix
 create mode 100644 changelog.d/7600.misc
 create mode 100644 changelog.d/7602.doc
 create mode 100644 changelog.d/7603.doc
 create mode 100644 changelog.d/7607.bugfix
 create mode 100644 changelog.d/7609.bugfix
 create mode 100644 changelog.d/7614.misc
 create mode 100644 changelog.d/7619.misc
 create mode 100644 changelog.d/7620.misc
 create mode 100644 changelog.d/7621.misc
 create mode 100644 changelog.d/7622.bugfix
 create mode 100644 changelog.d/7623.misc
 create mode 100644 changelog.d/7624.bugfix
 create mode 100644 changelog.d/7625.misc
 create mode 100644 changelog.d/7628.misc
 create mode 100644 changelog.d/7629.bugfix
 create mode 100644 changelog.d/7630.feature
 create mode 100644 changelog.d/7631.bugfix
 create mode 100644 changelog.d/7634.misc
 create mode 100644 changelog.d/7637.misc
 create mode 100644 changelog.d/7640.misc
 create mode 100644 changelog.d/7644.misc
 create mode 100644 changelog.d/7645.misc
 create mode 100644 changelog.d/7647.doc
 create mode 100644 changelog.d/7649.misc
 create mode 100644 changelog.d/7656.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index b45eccf02..dbb21d4c7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,69 +1,3 @@
-Synapse 1.15.0rc1 (2020-06-09)
-==============================
-
-Features
---------
-
-- Advertise support for Client-Server API r0.6.0 and remove related unstable feature flags. ([\#6585](https://github.com/matrix-org/synapse/issues/6585))
-- Add an option to disable autojoining rooms for guest accounts. ([\#6637](https://github.com/matrix-org/synapse/issues/6637))
-- For SAML authentication, add the ability to pass email addresses to be added to new users' accounts via SAML attributes. Contributed by Christopher Cooper. ([\#7385](https://github.com/matrix-org/synapse/issues/7385))
-- Add admin APIs to allow server admins to manage users' devices. Contributed by @dklimpel. ([\#7481](https://github.com/matrix-org/synapse/issues/7481))
-- Add support for generating thumbnails for WebP images. Previously, users would see an empty box instead of preview image. ([\#7586](https://github.com/matrix-org/synapse/issues/7586))
-- Support the standardized `m.login.sso` user-interactive authentication flow. ([\#7630](https://github.com/matrix-org/synapse/issues/7630))
-
-
-Bugfixes
---------
-
-- Allow new users to be registered via the admin API even if the monthly active user limit has been reached. Contributed by @dkimpel. ([\#7263](https://github.com/matrix-org/synapse/issues/7263))
-- Fix email notifications not being enabled for new users when created via the Admin API. ([\#7267](https://github.com/matrix-org/synapse/issues/7267))
-- Fix str placeholders in an instance of `PrepareDatabaseException`. Introduced in Synapse v1.8.0. ([\#7575](https://github.com/matrix-org/synapse/issues/7575))
-- Fix a bug in automatic user creation during first time login with `m.login.jwt`. Regression in v1.6.0. Contributed by @olof. ([\#7585](https://github.com/matrix-org/synapse/issues/7585))
-- Fix a bug causing the cross-signing keys to be ignored when resyncing a device list. ([\#7594](https://github.com/matrix-org/synapse/issues/7594))
-- Fix metrics failing when there is a large number of active background processes. ([\#7597](https://github.com/matrix-org/synapse/issues/7597))
-- Fix bug where returning rooms for a group would fail if it included a room that the server was not in. ([\#7599](https://github.com/matrix-org/synapse/issues/7599))
-- Fix duplicate key violation when persisting read markers. ([\#7607](https://github.com/matrix-org/synapse/issues/7607))
-- Prevent an entire iteration of the device list resync loop from failing if one server responds with a malformed result. ([\#7609](https://github.com/matrix-org/synapse/issues/7609))
-- Fix exceptions when fetching events from a remote host fails. ([\#7622](https://github.com/matrix-org/synapse/issues/7622))
-- Make `synctl restart` start synapse if it wasn't running. ([\#7624](https://github.com/matrix-org/synapse/issues/7624))
-- Pass device information through to the login endpoint when using the login fallback. ([\#7629](https://github.com/matrix-org/synapse/issues/7629))
-- Advertise the `m.login.token` login flow when OpenID Connect is enabled. ([\#7631](https://github.com/matrix-org/synapse/issues/7631))
-- Fix bug in account data replication stream. ([\#7656](https://github.com/matrix-org/synapse/issues/7656))
-
-
-Improved Documentation
-----------------------
-
-- Update the OpenBSD installation instructions. ([\#7587](https://github.com/matrix-org/synapse/issues/7587))
-- Advertise Python 3.8 support in `setup.py`. ([\#7602](https://github.com/matrix-org/synapse/issues/7602))
-- Add a link to `#synapse:matrix.org` in the troubleshooting section of the README. ([\#7603](https://github.com/matrix-org/synapse/issues/7603))
-- Clarifications to the admin api documentation. ([\#7647](https://github.com/matrix-org/synapse/issues/7647))
-
-
-Internal Changes
-----------------
-
-- Convert the identity handler to async/await. ([\#7561](https://github.com/matrix-org/synapse/issues/7561))
-- Improve query performance for fetching state from a PostgreSQL database. ([\#7567](https://github.com/matrix-org/synapse/issues/7567))
-- Speed up processing of federation stream RDATA rows. ([\#7584](https://github.com/matrix-org/synapse/issues/7584))
-- Add comment to systemd example to show postgresql dependency. ([\#7591](https://github.com/matrix-org/synapse/issues/7591))
-- Refactor `Ratelimiter` to limit the amount of expensive config value accesses. ([\#7595](https://github.com/matrix-org/synapse/issues/7595))
-- Convert groups handlers to async/await. ([\#7600](https://github.com/matrix-org/synapse/issues/7600))
-- Clean up exception handling in `SAML2ResponseResource`. ([\#7614](https://github.com/matrix-org/synapse/issues/7614))
-- Check that all asynchronous tasks succeed and general cleanup of `MonthlyActiveUsersTestCase` and `TestMauLimit`. ([\#7619](https://github.com/matrix-org/synapse/issues/7619))
-- Convert `get_user_id_by_threepid` to async/await. ([\#7620](https://github.com/matrix-org/synapse/issues/7620))
-- Switch to upstream `dh-virtualenv` rather than our fork for Debian package builds. ([\#7621](https://github.com/matrix-org/synapse/issues/7621))
-- Update CI scripts to check the number in the newsfile fragment. ([\#7623](https://github.com/matrix-org/synapse/issues/7623))
-- Check if the localpart of a Matrix ID is reserved for guest users earlier in the registration flow, as well as when responding to requests to `/register/available`. ([\#7625](https://github.com/matrix-org/synapse/issues/7625))
-- Minor cleanups to OpenID Connect integration. ([\#7628](https://github.com/matrix-org/synapse/issues/7628))
-- Attempt to fix flaky test: `PhoneHomeStatsTestCase.test_performance_100`. ([\#7634](https://github.com/matrix-org/synapse/issues/7634))
-- Fix typos of `m.olm.curve25519-aes-sha2` and `m.megolm.v1.aes-sha2` in comments, test files. ([\#7637](https://github.com/matrix-org/synapse/issues/7637))
-- Convert user directory, state deltas, and stats handlers to async/await. ([\#7640](https://github.com/matrix-org/synapse/issues/7640))
-- Remove some unused constants. ([\#7644](https://github.com/matrix-org/synapse/issues/7644))
-- Fix type information on `assert_*_is_admin` methods. ([\#7645](https://github.com/matrix-org/synapse/issues/7645))
-- Convert registration handler to async/await. ([\#7649](https://github.com/matrix-org/synapse/issues/7649))
-
-
 Synapse 1.14.0 (2020-05-28)
 ===========================
 
diff --git a/changelog.d/6585.feature b/changelog.d/6585.feature
new file mode 100644
index 000000000..ab2a85374
--- /dev/null
+++ b/changelog.d/6585.feature
@@ -0,0 +1 @@
+Advertise support for Client-Server API r0.6.0 and remove related unstable feature flags.
\ No newline at end of file
diff --git a/changelog.d/6637.feature b/changelog.d/6637.feature
new file mode 100644
index 000000000..5228ebc1e
--- /dev/null
+++ b/changelog.d/6637.feature
@@ -0,0 +1 @@
+Add an option to disable autojoining rooms for guest accounts.
diff --git a/changelog.d/7263.bugfix b/changelog.d/7263.bugfix
new file mode 100644
index 000000000..0b4739261
--- /dev/null
+++ b/changelog.d/7263.bugfix
@@ -0,0 +1 @@
+Allow new users to be registered via the admin API even if the monthly active user limit has been reached. Contributed by @dkimpel.
diff --git a/changelog.d/7267.bugfix b/changelog.d/7267.bugfix
new file mode 100644
index 000000000..0af316c1a
--- /dev/null
+++ b/changelog.d/7267.bugfix
@@ -0,0 +1 @@
+Fix email notifications not being enabled for new users when created via the Admin API.
diff --git a/changelog.d/7385.feature b/changelog.d/7385.feature
new file mode 100644
index 000000000..9d8fb2311
--- /dev/null
+++ b/changelog.d/7385.feature
@@ -0,0 +1 @@
+For SAML authentication, add the ability to pass email addresses to be added to new users' accounts via SAML attributes. Contributed by Christopher Cooper.
diff --git a/changelog.d/7481.feature b/changelog.d/7481.feature
new file mode 100644
index 000000000..f167f3632
--- /dev/null
+++ b/changelog.d/7481.feature
@@ -0,0 +1 @@
+Add admin APIs to allow server admins to manage users' devices. Contributed by @dklimpel.
diff --git a/changelog.d/7561.misc b/changelog.d/7561.misc
new file mode 100644
index 000000000..448dbd569
--- /dev/null
+++ b/changelog.d/7561.misc
@@ -0,0 +1 @@
+Convert the identity handler to async/await.
diff --git a/changelog.d/7567.misc b/changelog.d/7567.misc
new file mode 100644
index 000000000..b086d5d02
--- /dev/null
+++ b/changelog.d/7567.misc
@@ -0,0 +1 @@
+Improve query performance for fetching state from a PostgreSQL database.
diff --git a/changelog.d/7575.bugfix b/changelog.d/7575.bugfix
new file mode 100644
index 000000000..0ab5516eb
--- /dev/null
+++ b/changelog.d/7575.bugfix
@@ -0,0 +1 @@
+Fix str placeholders in an instance of `PrepareDatabaseException`. Introduced in Synapse v1.8.0.
diff --git a/changelog.d/7584.misc b/changelog.d/7584.misc
new file mode 100644
index 000000000..55d1689f7
--- /dev/null
+++ b/changelog.d/7584.misc
@@ -0,0 +1 @@
+Speed up processing of federation stream RDATA rows.
diff --git a/changelog.d/7585.bugfix b/changelog.d/7585.bugfix
new file mode 100644
index 000000000..263295599
--- /dev/null
+++ b/changelog.d/7585.bugfix
@@ -0,0 +1 @@
+Fix a bug in automatic user creation during first time login with `m.login.jwt`. Regression in v1.6.0. Contributed by @olof.
diff --git a/changelog.d/7586.feature b/changelog.d/7586.feature
new file mode 100644
index 000000000..ef0231d82
--- /dev/null
+++ b/changelog.d/7586.feature
@@ -0,0 +1 @@
+Add support for generating thumbnails for WebP images. Previously, users would see an empty box instead of preview image.
diff --git a/changelog.d/7587.doc b/changelog.d/7587.doc
new file mode 100644
index 000000000..ec4a43043
--- /dev/null
+++ b/changelog.d/7587.doc
@@ -0,0 +1 @@
+Update the OpenBSD installation instructions.
\ No newline at end of file
diff --git a/changelog.d/7591.misc b/changelog.d/7591.misc
new file mode 100644
index 000000000..17785b1f2
--- /dev/null
+++ b/changelog.d/7591.misc
@@ -0,0 +1 @@
+Add comment to systemd example to show postgresql dependency.
diff --git a/changelog.d/7594.bugfix b/changelog.d/7594.bugfix
new file mode 100644
index 000000000..f0c067e18
--- /dev/null
+++ b/changelog.d/7594.bugfix
@@ -0,0 +1 @@
+Fix a bug causing the cross-signing keys to be ignored when resyncing a device list.
diff --git a/changelog.d/7595.misc b/changelog.d/7595.misc
new file mode 100644
index 000000000..7a0646b1a
--- /dev/null
+++ b/changelog.d/7595.misc
@@ -0,0 +1 @@
+Refactor `Ratelimiter` to limit the amount of expensive config value accesses.
diff --git a/changelog.d/7597.bugfix b/changelog.d/7597.bugfix
new file mode 100644
index 000000000..e2ff95191
--- /dev/null
+++ b/changelog.d/7597.bugfix
@@ -0,0 +1 @@
+Fix metrics failing when there is a large number of active background processes.
diff --git a/changelog.d/7599.bugfix b/changelog.d/7599.bugfix
new file mode 100644
index 000000000..deefe5680
--- /dev/null
+++ b/changelog.d/7599.bugfix
@@ -0,0 +1 @@
+Fix bug where returning rooms for a group would fail if it included a room that the server was not in.
diff --git a/changelog.d/7600.misc b/changelog.d/7600.misc
new file mode 100644
index 000000000..3c2affbe6
--- /dev/null
+++ b/changelog.d/7600.misc
@@ -0,0 +1 @@
+Convert groups handlers to async/await.
diff --git a/changelog.d/7602.doc b/changelog.d/7602.doc
new file mode 100644
index 000000000..09039353d
--- /dev/null
+++ b/changelog.d/7602.doc
@@ -0,0 +1 @@
+Advertise Python 3.8 support in `setup.py`.
diff --git a/changelog.d/7603.doc b/changelog.d/7603.doc
new file mode 100644
index 000000000..e450888d4
--- /dev/null
+++ b/changelog.d/7603.doc
@@ -0,0 +1 @@
+Add a link to `#synapse:matrix.org` in the troubleshooting section of the README.
diff --git a/changelog.d/7607.bugfix b/changelog.d/7607.bugfix
new file mode 100644
index 000000000..04b22e5ff
--- /dev/null
+++ b/changelog.d/7607.bugfix
@@ -0,0 +1 @@
+Fix duplicate key violation when persisting read markers.
diff --git a/changelog.d/7609.bugfix b/changelog.d/7609.bugfix
new file mode 100644
index 000000000..e2eceeef0
--- /dev/null
+++ b/changelog.d/7609.bugfix
@@ -0,0 +1 @@
+Prevent an entire iteration of the device list resync loop from failing if one server responds with a malformed result.
diff --git a/changelog.d/7614.misc b/changelog.d/7614.misc
new file mode 100644
index 000000000..f0e24f9f6
--- /dev/null
+++ b/changelog.d/7614.misc
@@ -0,0 +1 @@
+Clean up exception handling in `SAML2ResponseResource`.
diff --git a/changelog.d/7619.misc b/changelog.d/7619.misc
new file mode 100644
index 000000000..23a8b30b1
--- /dev/null
+++ b/changelog.d/7619.misc
@@ -0,0 +1 @@
+Check that all asynchronous tasks succeed and general cleanup of `MonthlyActiveUsersTestCase` and `TestMauLimit`.
diff --git a/changelog.d/7620.misc b/changelog.d/7620.misc
new file mode 100644
index 000000000..f8357ee3b
--- /dev/null
+++ b/changelog.d/7620.misc
@@ -0,0 +1 @@
+Convert `get_user_id_by_threepid` to async/await.
\ No newline at end of file
diff --git a/changelog.d/7621.misc b/changelog.d/7621.misc
new file mode 100644
index 000000000..032a7de6e
--- /dev/null
+++ b/changelog.d/7621.misc
@@ -0,0 +1 @@
+Switch to upstream `dh-virtualenv` rather than our fork for Debian package builds.
diff --git a/changelog.d/7622.bugfix b/changelog.d/7622.bugfix
new file mode 100644
index 000000000..bcb82f7b0
--- /dev/null
+++ b/changelog.d/7622.bugfix
@@ -0,0 +1 @@
+Fix exceptions when fetching events from a remote host fails.
diff --git a/changelog.d/7623.misc b/changelog.d/7623.misc
new file mode 100644
index 000000000..34a6f6a6a
--- /dev/null
+++ b/changelog.d/7623.misc
@@ -0,0 +1 @@
+Update CI scripts to check the number in the newsfile fragment.
diff --git a/changelog.d/7624.bugfix b/changelog.d/7624.bugfix
new file mode 100644
index 000000000..ce55b2cc3
--- /dev/null
+++ b/changelog.d/7624.bugfix
@@ -0,0 +1 @@
+Make `synctl restart` start synapse if it wasn't running.
diff --git a/changelog.d/7625.misc b/changelog.d/7625.misc
new file mode 100644
index 000000000..4c61d8d99
--- /dev/null
+++ b/changelog.d/7625.misc
@@ -0,0 +1 @@
+Check if the localpart of a Matrix ID is reserved for guest users earlier in the registration flow, as well as when responding to requests to `/register/available`.
diff --git a/changelog.d/7628.misc b/changelog.d/7628.misc
new file mode 100644
index 000000000..74007450f
--- /dev/null
+++ b/changelog.d/7628.misc
@@ -0,0 +1 @@
+Minor cleanups to OpenID Connect integration.
diff --git a/changelog.d/7629.bugfix b/changelog.d/7629.bugfix
new file mode 100644
index 000000000..0debd580c
--- /dev/null
+++ b/changelog.d/7629.bugfix
@@ -0,0 +1 @@
+Pass device information through to the login endpoint when using the login fallback.
diff --git a/changelog.d/7630.feature b/changelog.d/7630.feature
new file mode 100644
index 000000000..cce31fc88
--- /dev/null
+++ b/changelog.d/7630.feature
@@ -0,0 +1 @@
+Support the standardized `m.login.sso` user-interactive authentication flow.
diff --git a/changelog.d/7631.bugfix b/changelog.d/7631.bugfix
new file mode 100644
index 000000000..7d74266d9
--- /dev/null
+++ b/changelog.d/7631.bugfix
@@ -0,0 +1 @@
+Advertise the `m.login.token` login flow when OpenID Connect is enabled.
diff --git a/changelog.d/7634.misc b/changelog.d/7634.misc
new file mode 100644
index 000000000..50dc6df02
--- /dev/null
+++ b/changelog.d/7634.misc
@@ -0,0 +1 @@
+Attempt to fix flaky test: `PhoneHomeStatsTestCase.test_performance_100`.
diff --git a/changelog.d/7637.misc b/changelog.d/7637.misc
new file mode 100644
index 000000000..90d41fa77
--- /dev/null
+++ b/changelog.d/7637.misc
@@ -0,0 +1 @@
+Fix typos of `m.olm.curve25519-aes-sha2` and `m.megolm.v1.aes-sha2` in comments, test files.
\ No newline at end of file
diff --git a/changelog.d/7640.misc b/changelog.d/7640.misc
new file mode 100644
index 000000000..55edc1c78
--- /dev/null
+++ b/changelog.d/7640.misc
@@ -0,0 +1 @@
+Convert user directory, state deltas, and stats handlers to async/await.
diff --git a/changelog.d/7644.misc b/changelog.d/7644.misc
new file mode 100644
index 000000000..0f45141bc
--- /dev/null
+++ b/changelog.d/7644.misc
@@ -0,0 +1 @@
+Remove some unused constants.
diff --git a/changelog.d/7645.misc b/changelog.d/7645.misc
new file mode 100644
index 000000000..e7f0dc89c
--- /dev/null
+++ b/changelog.d/7645.misc
@@ -0,0 +1 @@
+Fix type information on `assert_*_is_admin` methods.
diff --git a/changelog.d/7647.doc b/changelog.d/7647.doc
new file mode 100644
index 000000000..ae4a60f0a
--- /dev/null
+++ b/changelog.d/7647.doc
@@ -0,0 +1 @@
+Clarifications to the admin api documentation.
diff --git a/changelog.d/7649.misc b/changelog.d/7649.misc
new file mode 100644
index 000000000..8a26c8b3b
--- /dev/null
+++ b/changelog.d/7649.misc
@@ -0,0 +1 @@
+Convert registration handler to async/await.
diff --git a/changelog.d/7656.bugfix b/changelog.d/7656.bugfix
new file mode 100644
index 000000000..1aeddb5fb
--- /dev/null
+++ b/changelog.d/7656.bugfix
@@ -0,0 +1 @@
+Fix bug in account data replication stream.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 39c3a3ba4..f0105d3e2 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.15.0rc1"
+__version__ = "1.14.0"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when