mirror of
https://github.com/element-hq/synapse
synced 2024-09-05 11:50:07 +00:00
Merge branch 'master' into develop
This commit is contained in:
commit
6018bec919
9 changed files with 38 additions and 8 deletions
27
CHANGES.md
27
CHANGES.md
|
@ -1,3 +1,30 @@
|
||||||
|
Synapse 1.4.0 (2019-10-03)
|
||||||
|
==========================
|
||||||
|
|
||||||
|
Bugfixes
|
||||||
|
--------
|
||||||
|
|
||||||
|
- Redact `client_secret` in server logs. ([\#6158](https://github.com/matrix-org/synapse/issues/6158))
|
||||||
|
|
||||||
|
|
||||||
|
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)
|
Synapse 1.4.0rc1 (2019-09-26)
|
||||||
=============================
|
=============================
|
||||||
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Fix up sample config entry for `redaction_retention_period` option.
|
|
|
@ -1 +0,0 @@
|
||||||
Fix bug in background update that adds last seen information to the `devices` table, and improve its performance on Postgres.
|
|
|
@ -1 +0,0 @@
|
||||||
Fix bad performance of censoring redactions background task.
|
|
|
@ -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 +0,0 @@
|
||||||
Fix exceptions when storing large retry intervals for down remote servers.
|
|
6
debian/changelog
vendored
6
debian/changelog
vendored
|
@ -1,3 +1,9 @@
|
||||||
|
matrix-synapse-py3 (1.4.0) stable; urgency=medium
|
||||||
|
|
||||||
|
* New synapse release 1.4.0.
|
||||||
|
|
||||||
|
-- Synapse Packaging team <packages@matrix.org> Thu, 03 Oct 2019 13:22:25 +0100
|
||||||
|
|
||||||
matrix-synapse-py3 (1.3.1) stable; urgency=medium
|
matrix-synapse-py3 (1.3.1) stable; urgency=medium
|
||||||
|
|
||||||
* New synapse release 1.3.1.
|
* New synapse release 1.3.1.
|
||||||
|
|
|
@ -35,4 +35,4 @@ try:
|
||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
__version__ = "1.4.0rc1"
|
__version__ = "1.4.0"
|
||||||
|
|
|
@ -42,11 +42,13 @@ def cancelled_to_request_timed_out_error(value, timeout):
|
||||||
|
|
||||||
|
|
||||||
ACCESS_TOKEN_RE = re.compile(r"(\?.*access(_|%5[Ff])token=)[^&]*(.*)$")
|
ACCESS_TOKEN_RE = re.compile(r"(\?.*access(_|%5[Ff])token=)[^&]*(.*)$")
|
||||||
|
CLIENT_SECRET_RE = re.compile(r"(\?.*client(_|%5[Ff])secret=)[^&]*(.*)$")
|
||||||
|
|
||||||
|
|
||||||
def redact_uri(uri):
|
def redact_uri(uri):
|
||||||
"""Strips access tokens from the uri replaces with <redacted>"""
|
"""Strips sensitive information from the uri replaces with <redacted>"""
|
||||||
return ACCESS_TOKEN_RE.sub(r"\1<redacted>\3", uri)
|
uri = ACCESS_TOKEN_RE.sub(r"\1<redacted>\3", uri)
|
||||||
|
return CLIENT_SECRET_RE.sub(r"\1<redacted>\3", uri)
|
||||||
|
|
||||||
|
|
||||||
class QuieterFileBodyProducer(FileBodyProducer):
|
class QuieterFileBodyProducer(FileBodyProducer):
|
||||||
|
|
Loading…
Reference in a new issue