Merge branch 'master' into develop

9 files changed, 38 insertions, 8 deletions

diff --git a/CHANGES.md b/CHANGES.md
index 0a0d0b3439..165e1d4db4 100644
--- a/CHANGES.md
+++ b/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)
 =============================
 
diff --git a/changelog.d/6117.misc b/changelog.d/6117.misc
deleted file mode 100644
index f8bdb58f41..0000000000
--- a/changelog.d/6117.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix up sample config entry for `redaction_retention_period` option.
diff --git a/changelog.d/6135.bugfix b/changelog.d/6135.bugfix
deleted file mode 100644
index 5f9f010cb1..0000000000
--- a/changelog.d/6135.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug in background update that adds last seen information to the `devices` table, and improve its performance on Postgres.
diff --git a/changelog.d/6141.bugfix b/changelog.d/6141.bugfix
deleted file mode 100644
index c93920b7b5..0000000000
--- a/changelog.d/6141.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bad performance of censoring redactions background task.
diff --git a/changelog.d/6145.bugfix b/changelog.d/6145.bugfix
deleted file mode 100644
index 9e0eb5dd4c..0000000000
--- a/changelog.d/6145.bugfix
+++ /dev/null
@@ -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.
diff --git a/changelog.d/6146.bugfix b/changelog.d/6146.bugfix
deleted file mode 100644
index 1dad801836..0000000000
--- a/changelog.d/6146.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix exceptions when storing large retry intervals for down remote servers.
diff --git a/debian/changelog b/debian/changelog
index 76efc442d7..60c682cc57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
   * New synapse release 1.3.1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index ddfe9ec542..2d52d26af5 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -35,4 +35,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.4.0rc1"
+__version__ = "1.4.0"
diff --git a/synapse/http/__init__.py b/synapse/http/__init__.py
index 3acf772cd1..3880ce0d94 100644
--- a/synapse/http/__init__.py
+++ b/synapse/http/__init__.py
@@ -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):