OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

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

michaelkaye/matrix_org_hotfixes_increase_replication_timeout
Andrew Morgan 2019-10-03 13:06:32 +01:00
parent 23bb2713d2 0f46bf5737
commit f4f5355bcf
9 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CHANGES.md
View File

@ -1,3 +1,21 @@
Synapse 1.4.0rc2 (2019-10-02)
=============================
Bugfixes
--------
- Fix bug in background update that adds last seen information to the `devices` table, and improve its performance on Postgres. ([\#6135](https://github.com/matrix-org/synapse/issues/6135))
- Fix bad performance of censoring redactions background task. ([\#6141](https://github.com/matrix-org/synapse/issues/6141))
- Fix fetching censored redactions from DB, which caused APIs like initial sync to fail if it tried to include the censored redaction. ([\#6145](https://github.com/matrix-org/synapse/issues/6145))
- Fix exceptions when storing large retry intervals for down remote servers. ([\#6146](https://github.com/matrix-org/synapse/issues/6146))
Internal Changes
----------------
- Fix up sample config entry for `redaction_retention_period` option. ([\#6117](https://github.com/matrix-org/synapse/issues/6117))
Synapse 1.4.0rc1 (2019-09-26)
=============================

1
changelog.d/6117.misc
View File

@ -1 +0,0 @@
Fix up sample config entry for `redaction_retention_period` option.

1
changelog.d/6135.bugfix
View File

@ -1 +0,0 @@
Fix bug in background update that adds last seen information to the `devices` table, and improve its performance on Postgres.

1
changelog.d/6141.bugfix
View File

@ -1 +0,0 @@
Fix bad performance of censoring redactions background task.

1
changelog.d/6145.bugfix
View File

@ -1 +0,0 @@
Fix fetching censored redactions from DB, which caused APIs like initial sync to fail if it tried to include the censored redaction.

1
changelog.d/6146.bugfix
View File

@ -1 +0,0 @@
Fix exceptions when storing large retry intervals for down remote servers.

1
changelog.d/6158.bugfix Normal file
View File

@ -0,0 +1 @@
Redact `client_secret` in server logs.

2
synapse/__init__.py
View File

@ -35,4 +35,4 @@ try:
except ImportError:
pass
__version__ = "1.4.0rc1"
__version__ = "1.4.0rc2"

6
synapse/http/__init__.py
View File

@ -42,11 +42,13 @@ def cancelled_to_request_timed_out_error(value, timeout):
ACCESS_TOKEN_RE = re.compile(r"(\?.*access(_|%5[Ff])token=)[^&]*(.*)$")
CLIENT_SECRET_RE = re.compile(r"(\?.*client(_|%5[Ff])secret=)[^&]*(.*)$")
def redact_uri(uri):
"""Strips access tokens from the uri replaces with <redacted>"""
return ACCESS_TOKEN_RE.sub(r"\1<redacted>\3", uri)
"""Strips sensitive information from the uri replaces with <redacted>"""
uri = ACCESS_TOKEN_RE.sub(r"\1<redacted>\3", uri)
return CLIENT_SECRET_RE.sub(r"\1<redacted>\3", uri)
class QuieterFileBodyProducer(FileBodyProducer):