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

Don't log urlencoded access_tokens
pull/505/head
Erik Johnston 2016-01-19 14:28:29 +00:00
commit 7a079adc8f
1 changed files with 5 additions and 3 deletions

View File

@ -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
)