summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-10-09 18:17:42 +0100
committerMatthew Hodgson <matthew@matrix.org>2017-10-09 18:17:42 +0100
commitcd8494a9a1ee9a8a492de7c230978758a03b7c55 (patch)
treed390c522084eec1e3f3d162468a89bcb11c61bc2
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-github/matthew/fix-log-redaction.tar.xz
fix regexp for log redaction to actually redact AS access_tokens etc github/matthew/fix-log-redaction matthew/fix-log-redaction
-rw-r--r--synapse/http/site.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/site.py b/synapse/http/site.py
index 4b09d7ee66..a3a2c41217 100644
--- a/synapse/http/site.py
+++ b/synapse/http/site.py
@@ -20,7 +20,7 @@ import logging
 import re
 import time
 
-ACCESS_TOKEN_RE = re.compile(r'(\?.*access(_|%5[Ff])token=)[^&]*(.*)$')
+ACCESS_TOKEN_RE = re.compile(r'(\?\S*?access(_|%5[Ff])token=).*?(&|\s|$)')
 
 
 class SynapseRequest(Request):