diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-06-06 10:58:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-06 10:58:07 +0100 |
| commit | ad459a106cb9c7c51aefdc8b59d14ab549c7b271 (patch) | |
| tree | cf7a160ca0b25d834fa0440f3f7e847f1d370a0a | |
| parent | Merge pull request #3347 from krombel/py3_extend_tox_2 (diff) | |
| parent | also redact __str__ of ApplicationService used for logging (diff) | |
| download | synapse-ad459a106cb9c7c51aefdc8b59d14ab549c7b271.tar.xz | |
Merge pull request #3349 from t3chguy/redact_as_request_token
Redact AS tokens in log (fixes to #3327)
| -rw-r--r-- | synapse/appservice/__init__.py | 6 | ||||
| -rw-r--r-- | synapse/http/client.py | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/synapse/appservice/__init__.py b/synapse/appservice/__init__.py index 5fdb579723..d1c598622a 100644 --- a/synapse/appservice/__init__.py +++ b/synapse/appservice/__init__.py @@ -292,4 +292,8 @@ class ApplicationService(object): return self.rate_limited def __str__(self): - return "ApplicationService: %s" % (self.__dict__,) + # copy dictionary and redact token fields so they don't get logged + dict_copy = self.__dict__.copy() + dict_copy["token"] = "<redacted>" + dict_copy["hs_token"] = "<redacted>" + return "ApplicationService: %s" % (dict_copy,) diff --git a/synapse/http/client.py b/synapse/http/client.py index 5820d3e96f..8064a84c5c 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -106,14 +106,14 @@ class SimpleHttpClient(object): incoming_responses_counter.labels(method, response.code).inc() logger.info( "Received response to %s %s: %s", - method, uri, response.code + method, redact_uri(uri), response.code ) defer.returnValue(response) except Exception as e: incoming_responses_counter.labels(method, "ERR").inc() logger.info( "Error sending request to %s %s: %s %s", - method, uri, type(e).__name__, e.message + method, redact_uri(uri), type(e).__name__, e.message ) raise e |