diff options
author | David Baker <dave@matrix.org> | 2016-01-19 18:17:23 +0000 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2016-01-19 18:17:23 +0000 |
commit | afb7b377f23b275bf0274d6cbbfae462362cfc8c (patch) | |
tree | 212e275af6f3d52dba6e4367553ea649d9965d33 /synapse/app/homeserver.py | |
parent | Use the unread notification count to send accurate badge counts in push notif... (diff) | |
parent | Merge pull request #505 from matrix-org/erikj/push_fast (diff) | |
download | synapse-afb7b377f23b275bf0274d6cbbfae462362cfc8c.tar.xz |
Merge branch 'develop' into push_badge_counts
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-x | synapse/app/homeserver.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 58a4c812f6..6928d9d3e4 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -88,6 +88,9 @@ import time logger = logging.getLogger("synapse.app.homeserver") +ACCESS_TOKEN_RE = re.compile(r'(\?.*access(_|%5[Ff])token=)[^&]*(.*)$') + + def gz_wrap(r): return EncodingResourceWrapper(r, [GzipEncoderFactory()]) @@ -495,9 +498,8 @@ class SynapseRequest(Request): ) def get_redacted_uri(self): - return re.sub( - r'(\?.*access_token=)[^&]*(.*)$', - r'\1<redacted>\2', + return ACCESS_TOKEN_RE.sub( + r'\1<redacted>\3', self.uri ) |