Skip to content

Commit 1e9c270

Browse files
committed
Merge tag 'v1.59.1'
Synapse 1.59.1 (2022-05-18) =========================== This release fixes a long-standing issue which could prevent Synapse's user directory for updating properly. Bugfixes ---------------- - Fix a long-standing bug where the user directory background process would fail to make forward progress if a user included a null codepoint in their display name or avatar. Contributed by Nick @ Beeper. ([\matrix-org#12762](matrix-org#12762))
2 parents a15e12c + d24a148 commit 1e9c270

File tree

184 files changed

+4028
-1382
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+4028
-1382
lines changed

.github/workflows/docker.yml

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,32 +34,24 @@ jobs:
3434
username: ${{ secrets.DOCKERHUB_USERNAME }}
3535
password: ${{ secrets.DOCKERHUB_TOKEN }}
3636

37-
# TODO: consider using https://github.com/docker/metadata-action instead of this
38-
# custom magic
3937
- name: Calculate docker image tag
4038
id: set-tag
41-
run: |
42-
case "${GITHUB_REF}" in
43-
refs/heads/develop)
44-
tag=develop
45-
;;
46-
refs/heads/master|refs/heads/main)
47-
tag=latest
48-
;;
49-
refs/tags/*)
50-
tag=${GITHUB_REF#refs/tags/}
51-
;;
52-
*)
53-
tag=${GITHUB_SHA}
54-
;;
55-
esac
56-
echo "::set-output name=tag::$tag"
39+
uses: docker/metadata-action@master
40+
with:
41+
images: matrixdotorg/synapse
42+
flavor: |
43+
latest=false
44+
tags: |
45+
type=raw,value=develop,enable=${{ github.ref == 'refs/heads/develop' }}
46+
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
47+
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
48+
type=pep440,pattern={{raw}}
5749
5850
- name: Build and push all platforms
5951
uses: docker/build-push-action@v2
6052
with:
6153
push: true
6254
labels: "gitsha1=${{ github.sha }}"
63-
tags: "matrixdotorg/synapse:${{ steps.set-tag.outputs.tag }}"
55+
tags: "${{ steps.set-tag.outputs.tags }}"
6456
file: "docker/Dockerfile"
6557
platforms: linux/amd64,linux/arm64

.github/workflows/latest_deps.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,15 @@ jobs:
3232
with:
3333
python-version: "3.x"
3434
poetry-version: "1.2.0b1"
35+
extras: "all"
3536
# Dump installed versions for debugging.
3637
- run: poetry run pip list > before.txt
3738
# Upgrade all runtime dependencies only. This is intended to mimic a fresh
3839
# `pip install matrix-synapse[all]` as closely as possible.
3940
- run: poetry update --no-dev
4041
- run: poetry run pip list > after.txt && (diff -u before.txt after.txt || true)
42+
- name: Remove warn_unused_ignores from mypy config
43+
run: sed '/warn_unused_ignores = True/d' -i mypy.ini
4144
- run: poetry run mypy
4245
trial:
4346
runs-on: ubuntu-latest

.github/workflows/tests.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,9 @@ jobs:
2020
- run: scripts-dev/config-lint.sh
2121

2222
lint:
23-
# This does a vanilla `poetry install` - no extras. I'm slightly anxious
24-
# that we might skip some typechecks on code that uses extras. However,
25-
# I think the right way to fix this is to mark any extras needed for
26-
# typechecking as development dependencies. To detect this, we ought to
27-
# turn up mypy's strictness: disallow unknown imports and be accept fewer
28-
# uses of `Any`.
2923
uses: "matrix-org/backend-meta/.github/workflows/python-poetry-ci.yml@v1"
24+
with:
25+
typechecking-extras: "all"
3026

3127
lint-crlf:
3228
runs-on: ubuntu-latest

.github/workflows/twisted_trunk.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
poetry remove twisted
2525
poetry add --extras tls git+https://github.com/twisted/twisted.git#trunk
2626
poetry install --no-interaction --extras "all test"
27+
- name: Remove warn_unused_ignores from mypy config
28+
run: sed '/warn_unused_ignores = True/d' -i mypy.ini
2729
- run: poetry run mypy
2830

2931
trial:

CHANGES.md

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,138 @@
1+
Synapse 1.59.1 (2022-05-18)
2+
===========================
3+
4+
This release fixes a long-standing issue which could prevent Synapse's user directory for updating properly.
5+
6+
Bugfixes
7+
----------------
8+
9+
- Fix a long-standing bug where the user directory background process would fail to make forward progress if a user included a null codepoint in their display name or avatar. Contributed by Nick @ Beeper. ([\#12762](https://github.com/matrix-org/synapse/issues/12762))
10+
11+
12+
Synapse 1.59.0 (2022-05-17)
13+
===========================
14+
15+
Synapse 1.59 makes several changes that server administrators should be aware of:
16+
17+
- Device name lookup over federation is now disabled by default. ([\#12616](https://github.com/matrix-org/synapse/issues/12616))
18+
- The `synapse.app.appservice` and `synapse.app.user_dir` worker application types are now deprecated. ([\#12452](https://github.com/matrix-org/synapse/issues/12452), [\#12654](https://github.com/matrix-org/synapse/issues/12654))
19+
20+
See [the upgrade notes](https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md#upgrading-to-v1590) for more details.
21+
22+
Additionally, this release removes the non-standard `m.login.jwt` login type from Synapse. It can be replaced with `org.matrix.login.jwt` for identical behaviour. This is only used if `jwt_config.enabled` is set to `true` in the configuration. ([\#12597](https://github.com/matrix-org/synapse/issues/12597))
23+
24+
25+
Bugfixes
26+
--------
27+
28+
- Fix DB performance regression introduced in Synapse 1.59.0rc2. ([\#12745](https://github.com/matrix-org/synapse/issues/12745))
29+
30+
31+
Synapse 1.59.0rc2 (2022-05-16)
32+
==============================
33+
34+
Note: this release candidate includes a performance regression which can cause database disruption. Other release candidates in the v1.59.0 series are not affected, and a fix will be included in the v1.59.0 final release.
35+
36+
Bugfixes
37+
--------
38+
39+
- Fix a bug introduced in Synapse 1.58.0 where `/sync` would fail if the most recent event in a room was rejected. ([\#12729](https://github.com/matrix-org/synapse/issues/12729))
40+
41+
42+
Synapse 1.59.0rc1 (2022-05-10)
43+
==============================
44+
45+
Features
46+
--------
47+
48+
- Support [MSC3266](https://github.com/matrix-org/matrix-doc/pull/3266) room summaries over federation. ([\#11507](https://github.com/matrix-org/synapse/issues/11507))
49+
- Implement [changes](https://github.com/matrix-org/matrix-spec-proposals/pull/2285/commits/4a77139249c2e830aec3c7d6bd5501a514d1cc27) to [MSC2285 (hidden read receipts)](https://github.com/matrix-org/matrix-spec-proposals/pull/2285). Contributed by @SimonBrandner. ([\#12168](https://github.com/matrix-org/synapse/issues/12168), [\#12635](https://github.com/matrix-org/synapse/issues/12635), [\#12636](https://github.com/matrix-org/synapse/issues/12636), [\#12670](https://github.com/matrix-org/synapse/issues/12670))
50+
- Extend the [module API](https://github.com/matrix-org/synapse/blob/release-v1.59/synapse/module_api/__init__.py) to allow modules to change actions for existing push rules of local users. ([\#12406](https://github.com/matrix-org/synapse/issues/12406))
51+
- Add the `notify_appservices_from_worker` configuration option (superseding `notify_appservices`) to allow a generic worker to be designated as the worker to send traffic to Application Services. ([\#12452](https://github.com/matrix-org/synapse/issues/12452))
52+
- Add the `update_user_directory_from_worker` configuration option (superseding `update_user_directory`) to allow a generic worker to be designated as the worker to update the user directory. ([\#12654](https://github.com/matrix-org/synapse/issues/12654))
53+
- Add new `enable_registration_token_3pid_bypass` configuration option to allow registrations via token as an alternative to verifying a 3pid. ([\#12526](https://github.com/matrix-org/synapse/issues/12526))
54+
- Implement [MSC3786](https://github.com/matrix-org/matrix-spec-proposals/pull/3786): Add a default push rule to ignore `m.room.server_acl` events. ([\#12601](https://github.com/matrix-org/synapse/issues/12601))
55+
- Add new `mau_appservice_trial_days` configuration option to specify a different trial period for users registered via an appservice. ([\#12619](https://github.com/matrix-org/synapse/issues/12619))
56+
57+
58+
Bugfixes
59+
--------
60+
61+
- Fix a bug introduced in Synapse 1.48.0 where the latest thread reply provided failed to include the proper bundled aggregations. ([\#12273](https://github.com/matrix-org/synapse/issues/12273))
62+
- Fix a bug introduced in Synapse 1.22.0 where attempting to send a large amount of read receipts to an application service all at once would result in duplicate content and abnormally high memory usage. Contributed by Brad & Nick @ Beeper. ([\#12544](https://github.com/matrix-org/synapse/issues/12544))
63+
- Fix a bug introduced in Synapse 1.57.0 which could cause `Failed to calculate hosts in room` errors to be logged for outbound federation. ([\#12570](https://github.com/matrix-org/synapse/issues/12570))
64+
- Fix a long-standing bug where status codes would almost always get logged as `200!`, irrespective of the actual status code, when clients disconnect before a request has finished processing. ([\#12580](https://github.com/matrix-org/synapse/issues/12580))
65+
- Fix race when persisting an event and deleting a room that could lead to outbound federation breaking. ([\#12594](https://github.com/matrix-org/synapse/issues/12594))
66+
- Fix a bug introduced in Synapse 1.53.0 where bundled aggregations for annotations/edits were incorrectly calculated. ([\#12633](https://github.com/matrix-org/synapse/issues/12633))
67+
- Fix a long-standing bug where rooms containing power levels with string values could not be upgraded. ([\#12657](https://github.com/matrix-org/synapse/issues/12657))
68+
- Prevent memory leak from reoccurring when presence is disabled. ([\#12656](https://github.com/matrix-org/synapse/issues/12656))
69+
70+
71+
Updates to the Docker image
72+
---------------------------
73+
74+
- Explicitly opt-in to using [BuildKit-specific features](https://github.com/moby/buildkit/blob/master/frontend/dockerfile/docs/syntax.md) in the Dockerfile. This fixes issues with building images in some GitLab CI environments. ([\#12541](https://github.com/matrix-org/synapse/issues/12541))
75+
- Update the "Build docker images" GitHub Actions workflow to use `docker/metadata-action` to generate docker image tags, instead of a custom shell script. Contributed by @henryclw. ([\#12573](https://github.com/matrix-org/synapse/issues/12573))
76+
77+
78+
Improved Documentation
79+
----------------------
80+
81+
- Update SQL statements and replace use of old table `user_stats_historical` in docs for Synapse Admins. ([\#12536](https://github.com/matrix-org/synapse/issues/12536))
82+
- Add missing linebreak to `pipx` install instructions. ([\#12579](https://github.com/matrix-org/synapse/issues/12579))
83+
- Add information about the TCP replication module to docs. ([\#12621](https://github.com/matrix-org/synapse/issues/12621))
84+
- Fixes to the formatting of `README.rst`. ([\#12627](https://github.com/matrix-org/synapse/issues/12627))
85+
- Fix docs on how to run specific Complement tests using the `complement.sh` test runner. ([\#12664](https://github.com/matrix-org/synapse/issues/12664))
86+
87+
88+
Deprecations and Removals
89+
-------------------------
90+
91+
- Remove unstable identifiers from [MSC3069](https://github.com/matrix-org/matrix-doc/pull/3069). ([\#12596](https://github.com/matrix-org/synapse/issues/12596))
92+
- Remove the unspecified `m.login.jwt` login type and the unstable `uk.half-shot.msc2778.login.application_service` from
93+
[MSC2778](https://github.com/matrix-org/matrix-doc/pull/2778). ([\#12597](https://github.com/matrix-org/synapse/issues/12597))
94+
- Synapse now requires at least Python 3.7.1 (up from 3.7.0), for compatibility with the latest Twisted trunk. ([\#12613](https://github.com/matrix-org/synapse/issues/12613))
95+
96+
97+
Internal Changes
98+
----------------
99+
100+
- Use supervisord to supervise Postgres and Caddy in the Complement image to reduce restart time. ([\#12480](https://github.com/matrix-org/synapse/issues/12480))
101+
- Immediately retry any requests that have backed off when a server comes back online. ([\#12500](https://github.com/matrix-org/synapse/issues/12500))
102+
- Use `make_awaitable` instead of `defer.succeed` for return values of mocks in tests. ([\#12505](https://github.com/matrix-org/synapse/issues/12505))
103+
- Consistently check if an object is a `frozendict`. ([\#12564](https://github.com/matrix-org/synapse/issues/12564))
104+
- Protect module callbacks with read semantics against cancellation. ([\#12568](https://github.com/matrix-org/synapse/issues/12568))
105+
- Improve comments and error messages around access tokens. ([\#12577](https://github.com/matrix-org/synapse/issues/12577))
106+
- Improve docstrings for the receipts store. ([\#12581](https://github.com/matrix-org/synapse/issues/12581))
107+
- Use constants for read-receipts in tests. ([\#12582](https://github.com/matrix-org/synapse/issues/12582))
108+
- Log status code of cancelled requests as 499 and avoid logging stack traces for them. ([\#12587](https://github.com/matrix-org/synapse/issues/12587), [\#12663](https://github.com/matrix-org/synapse/issues/12663))
109+
- Remove special-case for `twisted` logger from default log config. ([\#12589](https://github.com/matrix-org/synapse/issues/12589))
110+
- Use `getClientAddress` instead of the deprecated `getClientIP`. ([\#12599](https://github.com/matrix-org/synapse/issues/12599))
111+
- Add link to documentation in Grafana Dashboard. ([\#12602](https://github.com/matrix-org/synapse/issues/12602))
112+
- Reduce log spam when running multiple event persisters. ([\#12610](https://github.com/matrix-org/synapse/issues/12610))
113+
- Add extra debug logging to federation sender. ([\#12614](https://github.com/matrix-org/synapse/issues/12614))
114+
- Prevent remote homeservers from requesting local user device names by default. ([\#12616](https://github.com/matrix-org/synapse/issues/12616))
115+
- Add a consistency check on events which we read from the database. ([\#12620](https://github.com/matrix-org/synapse/issues/12620))
116+
- Remove use of the `constantly` library and switch to enums for `EventRedactBehaviour`. Contributed by @andrewdoh. ([\#12624](https://github.com/matrix-org/synapse/issues/12624))
117+
- Remove unused code related to receipts. ([\#12632](https://github.com/matrix-org/synapse/issues/12632))
118+
- Minor improvements to the scripts for running Synapse in worker mode under Complement. ([\#12637](https://github.com/matrix-org/synapse/issues/12637))
119+
- Move `pympler` back in to the `all` extras. ([\#12652](https://github.com/matrix-org/synapse/issues/12652))
120+
- Fix spelling of `M_UNRECOGNIZED` in comments. ([\#12665](https://github.com/matrix-org/synapse/issues/12665))
121+
- Release script: confirm the commit to be tagged before tagging. ([\#12556](https://github.com/matrix-org/synapse/issues/12556))
122+
- Fix a typo in the announcement text generated by the Synapse release development script. ([\#12612](https://github.com/matrix-org/synapse/issues/12612))
123+
124+
### Typechecking
125+
126+
- Fix scripts-dev to pass typechecking. ([\#12356](https://github.com/matrix-org/synapse/issues/12356))
127+
- Add some type hints to datastore. ([\#12485](https://github.com/matrix-org/synapse/issues/12485))
128+
- Remove unused `# type: ignore`s. ([\#12531](https://github.com/matrix-org/synapse/issues/12531))
129+
- Allow unused `# type: ignore` comments in bleeding edge CI jobs. ([\#12576](https://github.com/matrix-org/synapse/issues/12576))
130+
- Remove redundant lines of config from `mypy.ini`. ([\#12608](https://github.com/matrix-org/synapse/issues/12608))
131+
- Update to mypy 0.950. ([\#12650](https://github.com/matrix-org/synapse/issues/12650))
132+
- Use `Concatenate` to better annotate `_do_execute`. ([\#12666](https://github.com/matrix-org/synapse/issues/12666))
133+
- Use `ParamSpec` to refine type hints. ([\#12667](https://github.com/matrix-org/synapse/issues/12667))
134+
- Fix mypy against latest pillow stubs. ([\#12671](https://github.com/matrix-org/synapse/issues/12671))
135+
1136
Synapse 1.58.1 (2022-05-05)
2137
===========================
3138

README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ solutions. The hope is for Matrix to act as the building blocks for a new
5555
generation of fully open and interoperable messaging and VoIP apps for the
5656
internet.
5757

58-
Synapse is a Matrix "homeserver" implementation developed by the matrix.org core
58+
Synapse is a Matrix "homeserver" implementation developed by the matrix.org core
5959
team, written in Python 3/Twisted.
6060

6161
In Matrix, every user runs one or more Matrix clients, which connect through to
@@ -294,13 +294,13 @@ directory of your choice::
294294
cd synapse
295295

296296
Synapse has a number of external dependencies. We maintain a fixed development
297-
environment using [poetry](https://python-poetry.org/). First, install poetry. We recommend
297+
environment using `Poetry <https://python-poetry.org/>`_. First, install poetry. We recommend::
298298

299299
pip install --user pipx
300300
pipx install poetry
301301

302302
as described `here <https://python-poetry.org/docs/#installing-with-pipx>`_.
303-
(See `poetry's installation docs <https://python-poetry.org/docs/#installation>`
303+
(See `poetry's installation docs <https://python-poetry.org/docs/#installation>`_
304304
for other installation methods.) Then ask poetry to create a virtual environment
305305
from the project and install Synapse's dependencies::
306306

@@ -309,11 +309,11 @@ from the project and install Synapse's dependencies::
309309
This will run a process of downloading and installing all the needed
310310
dependencies into a virtual env.
311311

312-
We recommend using the demo which starts 3 federated instances running on ports `8080` - `8082`
312+
We recommend using the demo which starts 3 federated instances running on ports `8080` - `8082`::
313313

314314
poetry run ./demo/start.sh
315315

316-
(to stop, you can use `poetry run ./demo/stop.sh`)
316+
(to stop, you can use ``poetry run ./demo/stop.sh``)
317317

318318
See the `demo documentation <https://matrix-org.github.io/synapse/develop/development/demo.html>`_
319319
for more information.

contrib/grafana/synapse.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,18 @@
6666
],
6767
"title": "Dashboards",
6868
"type": "dashboards"
69+
},
70+
{
71+
"asDropdown": false,
72+
"icon": "external link",
73+
"includeVars": false,
74+
"keepTime": false,
75+
"tags": [],
76+
"targetBlank": true,
77+
"title": "Synapse Documentation",
78+
"tooltip": "Open Documentation",
79+
"type": "link",
80+
"url": "https://matrix-org.github.io/synapse/latest/"
6981
}
7082
],
7183
"panels": [
@@ -10889,4 +10901,4 @@
1088910901
"title": "Synapse",
1089010902
"uid": "000000012",
1089110903
"version": 100
10892-
}
10904+
}

debian/build_virtualenv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ poetry export \
4141
--extras all \
4242
--extras test \
4343
--extras systemd \
44-
--extras cache_memory \
4544
-o exported_requirements.txt
4645
deactivate
4746
rm -rf "$TEMP_VENV"

debian/changelog

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
matrix-synapse-py3 (1.59.1) stable; urgency=medium
2+
3+
* New Synapse release 1.59.1.
4+
5+
-- Synapse Packaging team <[email protected]> Wed, 18 May 2022 11:41:46 +0100
6+
7+
matrix-synapse-py3 (1.59.0) stable; urgency=medium
8+
9+
* New Synapse release 1.59.0.
10+
11+
-- Synapse Packaging team <[email protected]> Tue, 17 May 2022 10:26:50 +0100
12+
13+
matrix-synapse-py3 (1.59.0~rc2) stable; urgency=medium
14+
15+
* New Synapse release 1.59.0rc2.
16+
17+
-- Synapse Packaging team <[email protected]> Mon, 16 May 2022 12:52:15 +0100
18+
19+
matrix-synapse-py3 (1.59.0~rc1) stable; urgency=medium
20+
21+
* Adjust how the `exported-requirements.txt` file is generated as part of
22+
the process of building these packages. This affects the package
23+
maintainers only; end-users are unaffected.
24+
* New Synapse release 1.59.0rc1.
25+
26+
-- Synapse Packaging team <[email protected]> Tue, 10 May 2022 10:45:08 +0100
27+
128
matrix-synapse-py3 (1.58.1) stable; urgency=medium
229

330
* Include python dependencies from the `systemd` and `cache_memory` extras package groups, which

docker/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# syntax=docker/dockerfile:1
12
# Dockerfile to build the matrixdotorg/synapse docker images.
23
#
34
# Note that it uses features which are only available in BuildKit - see

docker/Dockerfile-workers

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ RUN rm /etc/nginx/sites-enabled/default
2020
# Copy Synapse worker, nginx and supervisord configuration template files
2121
COPY ./docker/conf-workers/* /conf/
2222

23+
# Copy a script to prefix log lines with the supervisor program name
24+
COPY ./docker/prefix-log /usr/local/bin/
25+
2326
# Expose nginx listener port
2427
EXPOSE 8080/tcp
2528

docker/complement/SynapseWorkers.Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,16 @@ WORKDIR /data
3434
# Copy the caddy config
3535
COPY conf-workers/caddy.complement.json /root/caddy.json
3636

37+
COPY conf-workers/postgres.supervisord.conf /etc/supervisor/conf.d/postgres.conf
38+
COPY conf-workers/caddy.supervisord.conf /etc/supervisor/conf.d/caddy.conf
39+
3740
# Copy the entrypoint
3841
COPY conf-workers/start-complement-synapse-workers.sh /
3942

4043
# Expose caddy's listener ports
4144
EXPOSE 8008 8448
4245

43-
ENTRYPOINT /start-complement-synapse-workers.sh
46+
ENTRYPOINT ["/start-complement-synapse-workers.sh"]
4447

4548
# Update the healthcheck to have a shorter check interval
4649
HEALTHCHECK --start-period=5s --interval=1s --timeout=1s \

0 commit comments

Comments
 (0)