Merge branch 'release-v1.3.0' of github.com:matrix-org/synapse into matrix-org-hotfixes

2019-08-15 11:36:00 +01:00 · 2019-08-15 11:36:00 +01:00 · 9d4c716d85
parent d90b0946ed 8cf7fbbce0
commit 9d4c716d85
68 changed files with 89 additions and 69 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,3 +1,77 @@
 Synapse 1.3.0rc1 (2019-08-13)
 ==========================
 Features
 --------
 - Use `M_USER_DEACTIVATED` instead of `M_UNKNOWN` for errcode when a deactivated user attempts to login. ([\#5686](https://github.com/matrix-org/synapse/issues/5686))
 - Add sd_notify hooks to ease systemd integration and allows usage of Type=Notify. ([\#5732](https://github.com/matrix-org/synapse/issues/5732))
 - Synapse will no longer serve any media repo admin endpoints when `enable_media_repo` is set to False in the configuration. If a media repo worker is used, the admin APIs relating to the media repo will be served from it instead. ([\#5754](https://github.com/matrix-org/synapse/issues/5754), [\#5848](https://github.com/matrix-org/synapse/issues/5848))
 - 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. ([\#5783](https://github.com/matrix-org/synapse/issues/5783))
 - Allow defining HTML templates to serve the user on account renewal attempt when using the account validity feature. ([\#5807](https://github.com/matrix-org/synapse/issues/5807))
 Bugfixes
 --------
 - Fix UISIs during homeserver outage. ([\#5693](https://github.com/matrix-org/synapse/issues/5693), [\#5789](https://github.com/matrix-org/synapse/issues/5789))
 - Fix stack overflow in server key lookup code. ([\#5724](https://github.com/matrix-org/synapse/issues/5724))
 - start.sh no longer uses deprecated cli option. ([\#5725](https://github.com/matrix-org/synapse/issues/5725))
 - Log when we receive an event receipt from an unexpected origin. ([\#5743](https://github.com/matrix-org/synapse/issues/5743))
 - Fix debian packaging scripts to correctly build sid packages. ([\#5775](https://github.com/matrix-org/synapse/issues/5775))
 - Correctly handle redactions of redactions. ([\#5788](https://github.com/matrix-org/synapse/issues/5788))
 - Return 404 instead of 403 when accessing /rooms/{roomId}/event/{eventId} for an event without the appropriate permissions. ([\#5798](https://github.com/matrix-org/synapse/issues/5798))
 - Fix check that tombstone is a state event in push rules. ([\#5804](https://github.com/matrix-org/synapse/issues/5804))
 - Fix error when trying to login as a deactivated user when using a worker to handle login. ([\#5806](https://github.com/matrix-org/synapse/issues/5806))
 - Fix bug where user `/sync` stream could get wedged in rare circumstances. ([\#5825](https://github.com/matrix-org/synapse/issues/5825))
 - The purge_remote_media.sh script was fixed. ([\#5839](https://github.com/matrix-org/synapse/issues/5839))
 Deprecations and Removals
 -------------------------
 - 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. ([\#5678](https://github.com/matrix-org/synapse/issues/5678), [\#5729](https://github.com/matrix-org/synapse/issues/5729))
 - Remove non-functional 'expire_access_token' setting. ([\#5782](https://github.com/matrix-org/synapse/issues/5782))
 Internal Changes
 ----------------
 - Make Jaeger fully configurable. ([\#5694](https://github.com/matrix-org/synapse/issues/5694))
 - Add precautionary measures to prevent future abuse of `window.opener` in default welcome page. ([\#5695](https://github.com/matrix-org/synapse/issues/5695))
 - Reduce database IO usage by optimising queries for current membership. ([\#5706](https://github.com/matrix-org/synapse/issues/5706), [\#5738](https://github.com/matrix-org/synapse/issues/5738), [\#5746](https://github.com/matrix-org/synapse/issues/5746), [\#5752](https://github.com/matrix-org/synapse/issues/5752), [\#5770](https://github.com/matrix-org/synapse/issues/5770), [\#5774](https://github.com/matrix-org/synapse/issues/5774), [\#5792](https://github.com/matrix-org/synapse/issues/5792), [\#5793](https://github.com/matrix-org/synapse/issues/5793))
 - Improve caching when fetching `get_filtered_current_state_ids`. ([\#5713](https://github.com/matrix-org/synapse/issues/5713))
 - Don't accept opentracing data from clients. ([\#5715](https://github.com/matrix-org/synapse/issues/5715))
 - Speed up PostgreSQL unit tests in CI. ([\#5717](https://github.com/matrix-org/synapse/issues/5717))
 - Update the coding style document. ([\#5719](https://github.com/matrix-org/synapse/issues/5719))
 - Improve database query performance when recording retry intervals for remote hosts. ([\#5720](https://github.com/matrix-org/synapse/issues/5720))
 - Add a set of opentracing utils. ([\#5722](https://github.com/matrix-org/synapse/issues/5722))
 - Cache result of get_version_string to reduce overhead of `/version` federation requests. ([\#5730](https://github.com/matrix-org/synapse/issues/5730))
 - Return 'user_type' in admin API user endpoints results. ([\#5731](https://github.com/matrix-org/synapse/issues/5731))
 - Don't package the sytest test blacklist file. ([\#5733](https://github.com/matrix-org/synapse/issues/5733))
 - Replace uses of returnValue with plain return, as returnValue is not needed on Python 3. ([\#5736](https://github.com/matrix-org/synapse/issues/5736))
 - Blacklist some flakey tests in worker mode. ([\#5740](https://github.com/matrix-org/synapse/issues/5740))
 - Fix some error cases in the caching layer. ([\#5749](https://github.com/matrix-org/synapse/issues/5749))
 - Add a prometheus metric for pending cache lookups. ([\#5750](https://github.com/matrix-org/synapse/issues/5750))
 - Stop trying to fetch events with event_id=None. ([\#5753](https://github.com/matrix-org/synapse/issues/5753))
 - Convert RedactionTestCase to modern test style. ([\#5768](https://github.com/matrix-org/synapse/issues/5768))
 - Allow looping calls to be given arguments. ([\#5780](https://github.com/matrix-org/synapse/issues/5780))
 - Set the logs emitted when checking typing and presence timeouts to DEBUG level, not INFO. ([\#5785](https://github.com/matrix-org/synapse/issues/5785))
 - Remove DelayedCall debugging from the test suite, as it is no longer required in the vast majority of Synapse's tests. ([\#5787](https://github.com/matrix-org/synapse/issues/5787))
 - Remove some spurious exceptions from the logs where we failed to talk to a remote server. ([\#5790](https://github.com/matrix-org/synapse/issues/5790))
 - Improve performance when making `.well-known` requests by sharing the SSL options between requests. ([\#5794](https://github.com/matrix-org/synapse/issues/5794))
 - Disable codecov GitHub comments on PRs. ([\#5796](https://github.com/matrix-org/synapse/issues/5796))
 - Don't allow clients to send tombstone events that reference the room it's sent in. ([\#5801](https://github.com/matrix-org/synapse/issues/5801))
 - Deny redactions of events sent in a different room. ([\#5802](https://github.com/matrix-org/synapse/issues/5802))
 - Deny sending well known state types as non-state events. ([\#5805](https://github.com/matrix-org/synapse/issues/5805))
 - Handle incorrectly encoded query params correctly by returning a 400. ([\#5808](https://github.com/matrix-org/synapse/issues/5808))
 - Handle pusher being deleted during processing rather than logging an exception. ([\#5809](https://github.com/matrix-org/synapse/issues/5809))
 - Return 502 not 500 when failing to reach any remote server. ([\#5810](https://github.com/matrix-org/synapse/issues/5810))
 - Reduce global pauses in the events stream caused by expensive state resolution during persistence. ([\#5826](https://github.com/matrix-org/synapse/issues/5826))
 - Add a lower bound to well-known lookup cache time to avoid repeated lookups. ([\#5836](https://github.com/matrix-org/synapse/issues/5836))
 - Whitelist history visbility sytests in worker mode tests. ([\#5843](https://github.com/matrix-org/synapse/issues/5843))
 Synapse 1.2.1 (2019-07-26)
 ==========================
--- a/changelog.d/5678.removal
+++ b/changelog.d/5678.removal
@ -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.
--- a/changelog.d/5686.feature
+++ b/changelog.d/5686.feature
@ -1 +0,0 @@
 Use `M_USER_DEACTIVATED` instead of `M_UNKNOWN` for errcode when a deactivated user attempts to login.
--- a/changelog.d/5693.bugfix
+++ b/changelog.d/5693.bugfix
@ -1 +0,0 @@
 Fix UISIs during homeserver outage.
--- a/changelog.d/5694.misc
+++ b/changelog.d/5694.misc
@ -1 +0,0 @@
 Make Jaeger fully configurable.
--- a/changelog.d/5695.misc
+++ b/changelog.d/5695.misc
@ -1 +0,0 @@
 Add precautionary measures to prevent future abuse of `window.opener` in default welcome page.
--- a/changelog.d/5706.misc
+++ b/changelog.d/5706.misc
@ -1 +0,0 @@
 Reduce database IO usage by optimising queries for current membership.
--- a/changelog.d/5713.misc
+++ b/changelog.d/5713.misc
@ -1 +0,0 @@
 Improve caching when fetching `get_filtered_current_state_ids`.
--- a/changelog.d/5715.misc
+++ b/changelog.d/5715.misc
@ -1 +0,0 @@
 Don't accept opentracing data from clients.
--- a/changelog.d/5717.misc
+++ b/changelog.d/5717.misc
@ -1 +0,0 @@
 Speed up PostgreSQL unit tests in CI.
--- a/changelog.d/5719.misc
+++ b/changelog.d/5719.misc
@ -1 +0,0 @@
 Update the coding style document.
--- a/changelog.d/5720.misc
+++ b/changelog.d/5720.misc
@ -1 +0,0 @@
 Improve database query performance when recording retry intervals for remote hosts.
--- a/changelog.d/5722.misc
+++ b/changelog.d/5722.misc
@ -1 +0,0 @@
 Add a set of opentracing utils.
--- a/changelog.d/5724.bugfix
+++ b/changelog.d/5724.bugfix
@ -1 +0,0 @@
 Fix stack overflow in server key lookup code.
--- a/changelog.d/5725.bugfix
+++ b/changelog.d/5725.bugfix
@ -1 +0,0 @@
 start.sh no longer uses deprecated cli option.
--- a/changelog.d/5729.removal
+++ b/changelog.d/5729.removal
@ -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.
--- a/changelog.d/5730.misc
+++ b/changelog.d/5730.misc
@ -1 +0,0 @@
 Cache result of get_version_string to reduce overhead of `/version` federation requests.
--- a/changelog.d/5731.misc
+++ b/changelog.d/5731.misc
@ -1 +0,0 @@
 Return 'user_type' in admin API user endpoints results.
--- a/changelog.d/5732.feature
+++ b/changelog.d/5732.feature
@ -1 +0,0 @@
 Add sd_notify hooks to ease systemd integration and allows usage of Type=Notify.
--- a/changelog.d/5733.misc
+++ b/changelog.d/5733.misc
@ -1 +0,0 @@
 Don't package the sytest test blacklist file.
--- a/changelog.d/5736.misc
+++ b/changelog.d/5736.misc
@ -1 +0,0 @@
 Replace uses of returnValue with plain return, as returnValue is not needed on Python 3.
--- a/changelog.d/5738.misc
+++ b/changelog.d/5738.misc
@ -1 +0,0 @@
 Reduce database IO usage by optimising queries for current membership.
--- a/changelog.d/5740.misc
+++ b/changelog.d/5740.misc
@ -1 +0,0 @@
 Blacklist some flakey tests in worker mode.
--- a/changelog.d/5743.bugfix
+++ b/changelog.d/5743.bugfix
@ -1 +0,0 @@
 Log when we receive an event receipt from an unexpected origin.
--- a/changelog.d/5746.misc
+++ b/changelog.d/5746.misc
@ -1 +0,0 @@
 Reduce database IO usage by optimising queries for current membership.
--- a/changelog.d/5749.misc
+++ b/changelog.d/5749.misc
@ -1 +0,0 @@
 Fix some error cases in the caching layer.
--- a/changelog.d/5750.misc
+++ b/changelog.d/5750.misc
@ -1 +0,0 @@
 Add a prometheus metric for pending cache lookups.
--- a/changelog.d/5752.misc
+++ b/changelog.d/5752.misc
@ -1 +0,0 @@
 Reduce database IO usage by optimising queries for current membership.
--- a/changelog.d/5753.misc
+++ b/changelog.d/5753.misc
@ -1 +0,0 @@
 Stop trying to fetch events with event_id=None.
--- a/changelog.d/5754.feature
+++ b/changelog.d/5754.feature
@ -1 +0,0 @@
 Synapse will no longer serve any media repo admin endpoints when `enable_media_repo` is set to False in the configuration. If a media repo worker is used, the admin APIs relating to the media repo will be served from it instead.
--- a/changelog.d/5766.misc
+++ b/changelog.d/5766.misc
@ -0,0 +1 @@
 Remove libsqlite3-dev from required build dependencies.
--- a/changelog.d/5768.misc
+++ b/changelog.d/5768.misc
@ -1 +0,0 @@
 Convert RedactionTestCase to modern test style.
--- a/changelog.d/5770.misc
+++ b/changelog.d/5770.misc
@ -1 +0,0 @@
 Reduce database IO usage by optimising queries for current membership.
--- a/changelog.d/5774.misc
+++ b/changelog.d/5774.misc
@ -1 +0,0 @@
 Reduce database IO usage by optimising queries for current membership.
--- a/changelog.d/5775.bugfix
+++ b/changelog.d/5775.bugfix
@ -1 +0,0 @@
 Fix debian packaging scripts to correctly build sid packages.
--- a/changelog.d/5780.misc
+++ b/changelog.d/5780.misc
@ -1 +0,0 @@
 Allow looping calls to be given arguments.
--- a/changelog.d/5782.removal
+++ b/changelog.d/5782.removal
@ -1 +0,0 @@
 Remove non-functional 'expire_access_token' setting.
--- a/changelog.d/5783.feature
+++ b/changelog.d/5783.feature
@ -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.
--- a/changelog.d/5785.misc
+++ b/changelog.d/5785.misc
@ -1 +0,0 @@
 Set the logs emitted when checking typing and presence timeouts to DEBUG level, not INFO.
--- a/changelog.d/5787.misc
+++ b/changelog.d/5787.misc
@ -1 +0,0 @@
 Remove DelayedCall debugging from the test suite, as it is no longer required in the vast majority of Synapse's tests.
--- a/changelog.d/5788.bugfix
+++ b/changelog.d/5788.bugfix
@ -1 +0,0 @@
 Correctly handle redactions of redactions.
--- a/changelog.d/5789.bugfix
+++ b/changelog.d/5789.bugfix
@ -1 +0,0 @@
 Fix UISIs during homeserver outage.
--- a/changelog.d/5790.misc
+++ b/changelog.d/5790.misc
@ -1 +0,0 @@
 Remove some spurious exceptions from the logs where we failed to talk to a remote server.
--- a/changelog.d/5792.misc
+++ b/changelog.d/5792.misc
@ -1 +0,0 @@
 Reduce database IO usage by optimising queries for current membership.
--- a/changelog.d/5793.misc
+++ b/changelog.d/5793.misc
@ -1 +0,0 @@
 Reduce database IO usage by optimising queries for current membership.
--- a/changelog.d/5794.misc
+++ b/changelog.d/5794.misc
@ -1 +0,0 @@
 Improve performance when making `.well-known` requests by sharing the SSL options between requests.
--- a/changelog.d/5796.misc
+++ b/changelog.d/5796.misc
@ -1 +0,0 @@
 Disable codecov GitHub comments on PRs.
--- a/changelog.d/5798.bugfix
+++ b/changelog.d/5798.bugfix
@ -1 +0,0 @@
 Return 404 instead of 403 when accessing /rooms/{roomId}/event/{eventId} for an event without the appropriate permissions.
--- a/changelog.d/5801.misc
+++ b/changelog.d/5801.misc
@ -1 +0,0 @@
 Don't allow clients to send tombstone events that reference the room it's sent in.
--- a/changelog.d/5802.misc
+++ b/changelog.d/5802.misc
@ -1 +0,0 @@
 Deny redactions of events sent in a different room. 
--- a/changelog.d/5804.bugfix
+++ b/changelog.d/5804.bugfix
@ -1 +0,0 @@
 Fix check that tombstone is a state event in push rules.
--- a/changelog.d/5805.misc
+++ b/changelog.d/5805.misc
@ -1 +0,0 @@
 Deny sending well known state types as non-state events.
--- a/changelog.d/5806.bugfix
+++ b/changelog.d/5806.bugfix
@ -1 +0,0 @@
 Fix error when trying to login as a deactivated user when using a worker to handle login.
--- a/changelog.d/5807.feature
+++ b/changelog.d/5807.feature
@ -1 +0,0 @@
 Allow defining HTML templates to serve the user on account renewal attempt when using the account validity feature.
--- a/changelog.d/5808.misc
+++ b/changelog.d/5808.misc
@ -1 +0,0 @@
 Handle incorrectly encoded query params correctly by returning a 400.
--- a/changelog.d/5809.misc
+++ b/changelog.d/5809.misc
@ -1 +0,0 @@
 Handle pusher being deleted during processing rather than logging an exception.
--- a/changelog.d/5810.misc
+++ b/changelog.d/5810.misc
@ -1 +0,0 @@
 Return 502 not 500 when failing to reach any remote server.
--- a/changelog.d/5825.bugfix
+++ b/changelog.d/5825.bugfix
@ -1 +0,0 @@
 Fix bug where user `/sync` stream could get wedged in rare circumstances.
--- a/changelog.d/5826.misc
+++ b/changelog.d/5826.misc
@ -1 +0,0 @@
 Reduce global pauses in the events stream caused by expensive state resolution during persistence.
--- a/changelog.d/5836.misc
+++ b/changelog.d/5836.misc
@ -1 +0,0 @@
 Add a lower bound to well-known lookup cache time to avoid repeated lookups.
--- a/changelog.d/5839.bugfix
+++ b/changelog.d/5839.bugfix
@ -1 +0,0 @@
 The purge_remote_media.sh script was fixed.
--- a/changelog.d/5843.misc
+++ b/changelog.d/5843.misc
@ -1 +0,0 @@
 Whitelist history visbility sytests in worker mode tests.
--- a/changelog.d/5848.feature
+++ b/changelog.d/5848.feature
@ -1 +0,0 @@
 Synapse will no longer serve any media repo admin endpoints when `enable_media_repo` is set to False in the configuration. If a media repo worker is used, the admin APIs relating to the media repo will be served from it instead.
--- a/changelog.d/5851.bugfix
+++ b/changelog.d/5851.bugfix
@ -0,0 +1,2 @@
 Fix 500 Internal Server Error on `publicRooms` when the public room list was
 cached.
--- a/debian/changelog
+++ b/debian/changelog
@ -1,8 +1,7 @@
-matrix-synapse-py3 (1.2.1) stable; urgency=medium
+matrix-synapse-py3 (1.3.0) UNRELEASED; urgency=medium
-  * New synapse release 1.2.1.
+  [ Andrew Morgan ]
-
+  * Remove libsqlite3-dev from required build dependencies.
 -- Synapse Packaging team <packages@matrix.org>  Fri, 26 Jul 2019 11:32:47 +0100
 matrix-synapse-py3 (1.2.0) stable; urgency=medium
--- a/debian/control
+++ b/debian/control
@ -15,7 +15,6 @@ Build-Depends:
 python3-setuptools,
 python3-pip,
 python3-venv,
 libsqlite3-dev,
 tar,
 Standards-Version: 3.9.8
 Homepage: https://github.com/matrix-org/synapse
--- a/synapse/init.py
+++ b/synapse/init.py
@ -35,4 +35,4 @@ try:
 except ImportError:
    pass
-__version__ = "1.2.1"
+__version__ = "1.3.0rc1"
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@ -19,6 +19,8 @@ import functools
 import logging
 import re
 from twisted.internet.defer import maybeDeferred
 import synapse
 import synapse.logging.opentracing as opentracing
 from synapse.api.errors import Codes, FederationDeniedError, SynapseError
@ -745,8 +747,12 @@ class PublicRoomList(BaseFederationServlet):
        else:
            network_tuple = ThirdPartyInstanceID(None, None)
-        data = await self.handler.get_local_public_room_list(
+        data = await maybeDeferred(
-            limit, since_token, network_tuple=network_tuple, from_federation=True
+            self.handler.get_local_public_room_list,
            limit,
            since_token,
            network_tuple=network_tuple,
            from_federation=True,
        )
        return 200, data
		`@ -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.
		`@ -1 +0,0 @@`
			Use `M_USER_DEACTIVATED` instead of `M_UNKNOWN` for errcode when a deactivated user attempts to login.
		`@ -1 +0,0 @@`
			Add precautionary measures to prevent future abuse of `window.opener` in default welcome page.
		`@ -1 +0,0 @@`
			`Reduce database IO usage by optimising queries for current membership.`
		`@ -1 +0,0 @@`
			Improve caching when fetching `get_filtered_current_state_ids`.
		`@ -1 +0,0 @@`
			`Improve database query performance when recording retry intervals for remote hosts.`
		`@ -1 +0,0 @@`
			`Fix stack overflow in server key lookup code.`
		`@ -1 +0,0 @@`
			`start.sh no longer uses deprecated cli option.`
		`@ -1 +0,0 @@`
			Cache result of get_version_string to reduce overhead of `/version` federation requests.
		`@ -1 +0,0 @@`
			`Return 'user_type' in admin API user endpoints results.`