Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #477 from matrix-org/erikj/access_token_log 

Don't log urlencoded access_tokens
This commit is contained in:
Erik Johnston 2016-01-19 14:28:29 +00:00
parent b8518ffe65 44b4fc5f50
commit 7a079adc8f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/app/homeserver.py
View File

@ -88,6 +88,9 @@ import time
logger = logging.getLogger("synapse.app.homeserver") logger = logging.getLogger("synapse.app.homeserver")
ACCESS_TOKEN_RE = re.compile(r'(\?.*access(_|%5[Ff])token=)[^&]*(.*)$')
def gz_wrap(r): def gz_wrap(r):
return EncodingResourceWrapper(r, [GzipEncoderFactory()]) return EncodingResourceWrapper(r, [GzipEncoderFactory()])
@ -495,9 +498,8 @@ class SynapseRequest(Request):
) )
def get_redacted_uri(self): def get_redacted_uri(self):
return re.sub( return ACCESS_TOKEN_RE.sub(
r'(\?.*access_token=)[^&]*(.*)$', r'\1<redacted>\3',
r'\1<redacted>\2',
self.uri self.uri
) )