Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys

71 files changed, 33 insertions, 38 deletions

diff --git a/changelog.d/5633.bugfix b/changelog.d/5633.bugfix
new file mode 100644
index 0000000000..b2ff803b9d
--- /dev/null
+++ b/changelog.d/5633.bugfix
@@ -0,0 +1 @@
+Don't create broken room when power_level_content_override.users does not contain creator_id.
\ No newline at end of file
diff --git a/changelog.d/5678.removal b/changelog.d/5678.removal
deleted file mode 100644
index 085b84fda6..0000000000
--- a/changelog.d/5678.removal
+++ /dev/null
@@ -1 +0,0 @@
-Synapse now no longer accepts the `-v`/`--verbose`, `-f`/`--log-file`, or `--log-config` command line flags, and removes the deprecated `verbose` and `log_file` configuration file options. Users of these options should migrate their options into the dedicated log configuration.
diff --git a/changelog.d/5680.misc b/changelog.d/5680.misc
new file mode 100644
index 0000000000..46a403a188
--- /dev/null
+++ b/changelog.d/5680.misc
@@ -0,0 +1 @@
+Lay the groundwork for structured logging output.
diff --git a/changelog.d/5693.bugfix b/changelog.d/5693.bugfix
deleted file mode 100644
index d6f4e590ae..0000000000
--- a/changelog.d/5693.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix UISIs during homeserver outage.
diff --git a/changelog.d/5694.misc b/changelog.d/5694.misc
deleted file mode 100644
index 3b12dcc849..0000000000
--- a/changelog.d/5694.misc
+++ /dev/null
@@ -1 +0,0 @@
-Make Jaeger fully configurable.
diff --git a/changelog.d/5695.misc b/changelog.d/5695.misc
deleted file mode 100644
index 4741d32e25..0000000000
--- a/changelog.d/5695.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add precautionary measures to prevent future abuse of `window.opener` in default welcome page.
diff --git a/changelog.d/5706.misc b/changelog.d/5706.misc
deleted file mode 100644
index 5e15dfd5fa..0000000000
--- a/changelog.d/5706.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce database IO usage by optimising queries for current membership.
diff --git a/changelog.d/5713.misc b/changelog.d/5713.misc
deleted file mode 100644
index 01ea1cf8d7..0000000000
--- a/changelog.d/5713.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve caching when fetching `get_filtered_current_state_ids`.
diff --git a/changelog.d/5715.misc b/changelog.d/5715.misc
deleted file mode 100644
index a77366e0c0..0000000000
--- a/changelog.d/5715.misc
+++ /dev/null
@@ -1 +0,0 @@
-Don't accept opentracing data from clients.
diff --git a/changelog.d/5717.misc b/changelog.d/5717.misc
deleted file mode 100644
index 07dc3bca94..0000000000
--- a/changelog.d/5717.misc
+++ /dev/null
@@ -1 +0,0 @@
-Speed up PostgreSQL unit tests in CI.
diff --git a/changelog.d/5719.misc b/changelog.d/5719.misc
deleted file mode 100644
index 6d5294724c..0000000000
--- a/changelog.d/5719.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update the coding style document.
diff --git a/changelog.d/5720.misc b/changelog.d/5720.misc
deleted file mode 100644
index 590f64f19d..0000000000
--- a/changelog.d/5720.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve database query performance when recording retry intervals for remote hosts.
diff --git a/changelog.d/5722.misc b/changelog.d/5722.misc
deleted file mode 100644
index f2d236188d..0000000000
--- a/changelog.d/5722.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a set of opentracing utils.
diff --git a/changelog.d/5724.bugfix b/changelog.d/5724.bugfix
deleted file mode 100644
index 1b3683daf6..0000000000
--- a/changelog.d/5724.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix stack overflow in server key lookup code.
\ No newline at end of file
diff --git a/changelog.d/5725.bugfix b/changelog.d/5725.bugfix
deleted file mode 100644
index 73ef419727..0000000000
--- a/changelog.d/5725.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-start.sh no longer uses deprecated cli option.
diff --git a/changelog.d/5729.removal b/changelog.d/5729.removal
deleted file mode 100644
index 3af5198e6b..0000000000
--- a/changelog.d/5729.removal
+++ /dev/null
@@ -1 +0,0 @@
- Synapse now no longer accepts the `-v`/`--verbose`, `-f`/`--log-file`, or `--log-config` command line flags, and removes the deprecated `verbose` and `log_file` configuration file options. Users of these options should migrate their options into the dedicated log configuration.
diff --git a/changelog.d/5730.misc b/changelog.d/5730.misc
deleted file mode 100644
index a99677f5e7..0000000000
--- a/changelog.d/5730.misc
+++ /dev/null
@@ -1 +0,0 @@
-Cache result of get_version_string to reduce overhead of `/version` federation requests.
diff --git a/changelog.d/5731.misc b/changelog.d/5731.misc
deleted file mode 100644
index dffae5d874..0000000000
--- a/changelog.d/5731.misc
+++ /dev/null
@@ -1 +0,0 @@
-Return 'user_type' in admin API user endpoints results.
diff --git a/changelog.d/5732.feature b/changelog.d/5732.feature
deleted file mode 100644
index 9021864350..0000000000
--- a/changelog.d/5732.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add sd_notify hooks to ease systemd integration and allows usage of Type=Notify.
diff --git a/changelog.d/5733.misc b/changelog.d/5733.misc
deleted file mode 100644
index a2a8c26383..0000000000
--- a/changelog.d/5733.misc
+++ /dev/null
@@ -1 +0,0 @@
-Don't package the sytest test blacklist file.
diff --git a/changelog.d/5736.misc b/changelog.d/5736.misc
deleted file mode 100644
index 5713b8b32d..0000000000
--- a/changelog.d/5736.misc
+++ /dev/null
@@ -1 +0,0 @@
-Replace uses of returnValue with plain return, as returnValue is not needed on Python 3.
diff --git a/changelog.d/5738.misc b/changelog.d/5738.misc
deleted file mode 100644
index 5e15dfd5fa..0000000000
--- a/changelog.d/5738.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce database IO usage by optimising queries for current membership.
diff --git a/changelog.d/5740.misc b/changelog.d/5740.misc
deleted file mode 100644
index 97a476bef5..0000000000
--- a/changelog.d/5740.misc
+++ /dev/null
@@ -1 +0,0 @@
-Blacklist some flakey tests in worker mode.
diff --git a/changelog.d/5743.bugfix b/changelog.d/5743.bugfix
deleted file mode 100644
index 65728ff079..0000000000
--- a/changelog.d/5743.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Log when we receive an event receipt from an unexpected origin.
diff --git a/changelog.d/5746.misc b/changelog.d/5746.misc
deleted file mode 100644
index 5e15dfd5fa..0000000000
--- a/changelog.d/5746.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce database IO usage by optimising queries for current membership.
diff --git a/changelog.d/5749.misc b/changelog.d/5749.misc
deleted file mode 100644
index 48dd61f461..0000000000
--- a/changelog.d/5749.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix some error cases in the caching layer.
diff --git a/changelog.d/5750.misc b/changelog.d/5750.misc
deleted file mode 100644
index 6beaa460a5..0000000000
--- a/changelog.d/5750.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a prometheus metric for pending cache lookups.
\ No newline at end of file
diff --git a/changelog.d/5752.misc b/changelog.d/5752.misc
deleted file mode 100644
index 5e15dfd5fa..0000000000
--- a/changelog.d/5752.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce database IO usage by optimising queries for current membership.
diff --git a/changelog.d/5753.misc b/changelog.d/5753.misc
deleted file mode 100644
index 22bba9ce3c..0000000000
--- a/changelog.d/5753.misc
+++ /dev/null
@@ -1 +0,0 @@
-Stop trying to fetch events with event_id=None.
diff --git a/changelog.d/5768.misc b/changelog.d/5768.misc
deleted file mode 100644
index 7a9c88b4c2..0000000000
--- a/changelog.d/5768.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert RedactionTestCase to modern test style.
diff --git a/changelog.d/5770.misc b/changelog.d/5770.misc
deleted file mode 100644
index 5e15dfd5fa..0000000000
--- a/changelog.d/5770.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce database IO usage by optimising queries for current membership.
diff --git a/changelog.d/5771.feature b/changelog.d/5771.feature
new file mode 100644
index 0000000000..f2f4de1fdd
--- /dev/null
+++ b/changelog.d/5771.feature
@@ -0,0 +1 @@
+Make Opentracing work in worker mode.
diff --git a/changelog.d/5774.misc b/changelog.d/5774.misc
deleted file mode 100644
index 5e15dfd5fa..0000000000
--- a/changelog.d/5774.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce database IO usage by optimising queries for current membership.
diff --git a/changelog.d/5775.bugfix b/changelog.d/5775.bugfix
deleted file mode 100644
index b124897d80..0000000000
--- a/changelog.d/5775.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix debian packaging scripts to correctly build sid packages.
diff --git a/changelog.d/5776.misc b/changelog.d/5776.misc
new file mode 100644
index 0000000000..1fb1b9c152
--- /dev/null
+++ b/changelog.d/5776.misc
@@ -0,0 +1 @@
+Update opentracing docs to use the unified `trace` method.
diff --git a/changelog.d/5780.misc b/changelog.d/5780.misc
deleted file mode 100644
index b7eb56e625..0000000000
--- a/changelog.d/5780.misc
+++ /dev/null
@@ -1 +0,0 @@
-Allow looping calls to be given arguments.
diff --git a/changelog.d/5782.removal b/changelog.d/5782.removal
deleted file mode 100644
index 658bf923ab..0000000000
--- a/changelog.d/5782.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove non-functional 'expire_access_token' setting.
diff --git a/changelog.d/5783.feature b/changelog.d/5783.feature
deleted file mode 100644
index 18f5a3cb28..0000000000
--- a/changelog.d/5783.feature
+++ /dev/null
@@ -1 +0,0 @@
-Synapse can now be configured to not join remote rooms of a given "complexity" (currently, state events) over federation. This option can be used to prevent adverse performance on resource-constrained homeservers.
diff --git a/changelog.d/5785.misc b/changelog.d/5785.misc
deleted file mode 100644
index 0691222c42..0000000000
--- a/changelog.d/5785.misc
+++ /dev/null
@@ -1 +0,0 @@
-Set the logs emitted when checking typing and presence timeouts to DEBUG level, not INFO.
diff --git a/changelog.d/5789.bugfix b/changelog.d/5789.bugfix
deleted file mode 100644
index d6f4e590ae..0000000000
--- a/changelog.d/5789.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix UISIs during homeserver outage.
diff --git a/changelog.d/5792.misc b/changelog.d/5792.misc
deleted file mode 100644
index 5e15dfd5fa..0000000000
--- a/changelog.d/5792.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce database IO usage by optimising queries for current membership.
diff --git a/changelog.d/5793.misc b/changelog.d/5793.misc
deleted file mode 100644
index 5e15dfd5fa..0000000000
--- a/changelog.d/5793.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce database IO usage by optimising queries for current membership.
diff --git a/changelog.d/5844.misc b/changelog.d/5844.misc
new file mode 100644
index 0000000000..a0826af0d2
--- /dev/null
+++ b/changelog.d/5844.misc
@@ -0,0 +1 @@
+Retry well-known lookup before the cache expires, giving a grace period where the remote well-known can be down but we still use the old result.
diff --git a/changelog.d/5845.feature b/changelog.d/5845.feature
new file mode 100644
index 0000000000..7b0dc9a95e
--- /dev/null
+++ b/changelog.d/5845.feature
@@ -0,0 +1 @@
+Add an admin API to purge old rooms from the database.
diff --git a/changelog.d/5850.feature b/changelog.d/5850.feature
new file mode 100644
index 0000000000..b565929a54
--- /dev/null
+++ b/changelog.d/5850.feature
@@ -0,0 +1 @@
+Add retry to well-known lookups if we have recently seen a valid well-known record for the server.
diff --git a/changelog.d/5852.feature b/changelog.d/5852.feature
new file mode 100644
index 0000000000..4a0fc6c542
--- /dev/null
+++ b/changelog.d/5852.feature
@@ -0,0 +1 @@
+Pass opentracing contexts between servers when transmitting EDUs.
diff --git a/changelog.d/5855.misc b/changelog.d/5855.misc
new file mode 100644
index 0000000000..32db7fbe37
--- /dev/null
+++ b/changelog.d/5855.misc
@@ -0,0 +1 @@
+Opentracing for room and e2e keys.
diff --git a/changelog.d/5856.feature b/changelog.d/5856.feature
new file mode 100644
index 0000000000..f4310b9244
--- /dev/null
+++ b/changelog.d/5856.feature
@@ -0,0 +1 @@
+Add a tag recording a request's authenticated entity and corresponding servlet in opentracing.
diff --git a/changelog.d/5857.bugfix b/changelog.d/5857.bugfix
new file mode 100644
index 0000000000..008799ccbb
--- /dev/null
+++ b/changelog.d/5857.bugfix
@@ -0,0 +1 @@
+Fix database index so that different backup versions can have the same sessions.
diff --git a/changelog.d/5859.feature b/changelog.d/5859.feature
new file mode 100644
index 0000000000..52df7fc81b
--- /dev/null
+++ b/changelog.d/5859.feature
@@ -0,0 +1 @@
+Add unstable support for MSC2197 (filtered search requests over federation), in order to allow upcoming room directory query performance improvements.
diff --git a/changelog.d/5860.misc b/changelog.d/5860.misc
new file mode 100644
index 0000000000..f9960b17b4
--- /dev/null
+++ b/changelog.d/5860.misc
@@ -0,0 +1 @@
+Remove log line for debugging issue #5407.
diff --git a/changelog.d/5863.bugfix b/changelog.d/5863.bugfix
new file mode 100644
index 0000000000..bceae5be67
--- /dev/null
+++ b/changelog.d/5863.bugfix
@@ -0,0 +1 @@
+Fix Synapse looking for config options `password_reset_failure_template` and `password_reset_success_template`, when they are actually `password_reset_template_failure_html`, `password_reset_template_success_html`.
diff --git a/changelog.d/5864.feature b/changelog.d/5864.feature
new file mode 100644
index 0000000000..40ac11db64
--- /dev/null
+++ b/changelog.d/5864.feature
@@ -0,0 +1 @@
+Correctly retry all hosts returned from SRV when we fail to connect.
diff --git a/changelog.d/5877.removal b/changelog.d/5877.removal
new file mode 100644
index 0000000000..b6d84fb401
--- /dev/null
+++ b/changelog.d/5877.removal
@@ -0,0 +1 @@
+Remove shared secret registration from client/r0/register endpoint. Contributed by Awesome Technologies Innovationslabor GmbH.
diff --git a/changelog.d/5878.feature b/changelog.d/5878.feature
new file mode 100644
index 0000000000..d9d6df880e
--- /dev/null
+++ b/changelog.d/5878.feature
@@ -0,0 +1 @@
+Add admin API endpoint for setting whether or not a user is a server administrator.
diff --git a/changelog.d/5885.bugfix b/changelog.d/5885.bugfix
new file mode 100644
index 0000000000..411d925fd4
--- /dev/null
+++ b/changelog.d/5885.bugfix
@@ -0,0 +1 @@
+Fix stack overflow when recovering an appservice which had an outage.
diff --git a/changelog.d/5886.misc b/changelog.d/5886.misc
new file mode 100644
index 0000000000..22adba3d85
--- /dev/null
+++ b/changelog.d/5886.misc
@@ -0,0 +1 @@
+Refactor the Appservice scheduler code.
diff --git a/changelog.d/5893.misc b/changelog.d/5893.misc
new file mode 100644
index 0000000000..07ee4888dc
--- /dev/null
+++ b/changelog.d/5893.misc
@@ -0,0 +1 @@
+Drop some unused tables.
diff --git a/changelog.d/5894.misc b/changelog.d/5894.misc
new file mode 100644
index 0000000000..fca4485ff7
--- /dev/null
+++ b/changelog.d/5894.misc
@@ -0,0 +1 @@
+Add missing index on users_in_public_rooms to improve the performance of directory queries.
diff --git a/changelog.d/5895.feature b/changelog.d/5895.feature
new file mode 100644
index 0000000000..c394a3772c
--- /dev/null
+++ b/changelog.d/5895.feature
@@ -0,0 +1 @@
+Add config option to sign remote key query responses with a separate key.
diff --git a/changelog.d/5896.misc b/changelog.d/5896.misc
new file mode 100644
index 0000000000..ed47c747bd
--- /dev/null
+++ b/changelog.d/5896.misc
@@ -0,0 +1 @@
+Improve the logging when we have an error when fetching signing keys.
diff --git a/changelog.d/5897.feature b/changelog.d/5897.feature
new file mode 100644
index 0000000000..7b10774c96
--- /dev/null
+++ b/changelog.d/5897.feature
@@ -0,0 +1 @@
+Switch to the v2 lookup API for 3PID invites.
\ No newline at end of file
diff --git a/changelog.d/5900.feature b/changelog.d/5900.feature
new file mode 100644
index 0000000000..b62d88a76b
--- /dev/null
+++ b/changelog.d/5900.feature
@@ -0,0 +1 @@
+Add support for config templating.
diff --git a/changelog.d/5902.feature b/changelog.d/5902.feature
new file mode 100644
index 0000000000..0660f65cfa
--- /dev/null
+++ b/changelog.d/5902.feature
@@ -0,0 +1 @@
+Users with the type of "support" or "bot" are no longer required to consent.
\ No newline at end of file
diff --git a/changelog.d/5904.feature b/changelog.d/5904.feature
new file mode 100644
index 0000000000..43b5304f39
--- /dev/null
+++ b/changelog.d/5904.feature
@@ -0,0 +1 @@
+Let synctl accept a directory of config files.
diff --git a/changelog.d/5906.feature b/changelog.d/5906.feature
new file mode 100644
index 0000000000..7c789510a6
--- /dev/null
+++ b/changelog.d/5906.feature
@@ -0,0 +1 @@
+Increase max display name size to 256.
diff --git a/changelog.d/5909.misc b/changelog.d/5909.misc
new file mode 100644
index 0000000000..03d0c4367b
--- /dev/null
+++ b/changelog.d/5909.misc
@@ -0,0 +1 @@
+Fix error message which referred to public_base_url instead of public_baseurl. Thanks to @aaronraimist for the fix!
diff --git a/changelog.d/5911.misc b/changelog.d/5911.misc
new file mode 100644
index 0000000000..fe5a8fd59c
--- /dev/null
+++ b/changelog.d/5911.misc
@@ -0,0 +1 @@
+Add support for database engine-specific schema deltas, based on file extension.
\ No newline at end of file
diff --git a/changelog.d/5914.feature b/changelog.d/5914.feature
new file mode 100644
index 0000000000..85c7bf5963
--- /dev/null
+++ b/changelog.d/5914.feature
@@ -0,0 +1 @@
+Add admin API endpoint for getting whether or not a user is a server administrator.
diff --git a/changelog.d/5920.bugfix b/changelog.d/5920.bugfix
new file mode 100644
index 0000000000..e45eb0ffee
--- /dev/null
+++ b/changelog.d/5920.bugfix
@@ -0,0 +1 @@
+Fix a cache-invalidation bug for worker-based deployments.
diff --git a/changelog.d/5926.misc b/changelog.d/5926.misc
new file mode 100644
index 0000000000..4383c302ec
--- /dev/null
+++ b/changelog.d/5926.misc
@@ -0,0 +1 @@
+Add link in sample config to the logging config schema.