diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-09 16:52:21 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-09 16:52:21 +0100 |
| commit | 5c1f886c75979b606c1e8bb45fcd8b7d26a71f39 (patch) | |
| tree | ee651459cda811d4ac5d11f1e2fc4d9c06df037a /synapse/http/__init__.py | |
| parent | Update (diff) | |
| parent | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets (diff) | |
| download | synapse-5c1f886c75979b606c1e8bb45fcd8b7d26a71f39.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner
Diffstat (limited to 'synapse/http/__init__.py')
| -rw-r--r-- | synapse/http/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
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): |