diff options
| author | Erik Johnston <erik@matrix.org> | 2015-06-15 13:37:58 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-06-15 13:37:58 +0100 |
| commit | f00f8346f143dc306e184b6d479294ab11a4ff55 (patch) | |
| tree | b3a0275d6773a0411869df794018aa52148c6413 /synapse/http/server.py | |
| parent | Log requests and responses sent via http.client (diff) | |
| download | synapse-f00f8346f143dc306e184b6d479294ab11a4ff55.tar.xz | |
Make http.server request logging more verbose, but redact access_tokens
Diffstat (limited to 'synapse/http/server.py')
| -rw-r--r-- | synapse/http/server.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py index ae8f3b3972..e6e8a59f6c 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -32,6 +32,7 @@ from twisted.web.util import redirectTo import collections import logging +import re import urllib logger = logging.getLogger(__name__) @@ -82,9 +83,18 @@ def request_handler(request_handler): code = None start = self.clock.time_msec() try: + request_uri = request.uri + + # Don't log access_tokens + request_uri = re.sub( + r'(\?.*access_token=)[^&]*(.*)$', + r'\1<redacted>\2', + request_uri + ) + logger.info( - "Received request: %s %s", - request.method, request.path + "%s - Received request: %s %s", + request.getClientIP(), request.method, request_uri ) d = request_handler(self, request) with PreserveLoggingContext(): |