Skip to content
Snippets Groups Projects
Unverified Commit 09503126 authored by Michael Telatynski's avatar Michael Telatynski
Browse files

Strip `access_token` from outgoing requests using existing regex

parent a9e97dcd
No related branches found
No related tags found
No related merge requests found
...@@ -20,6 +20,7 @@ from synapse.api.errors import ( ...@@ -20,6 +20,7 @@ from synapse.api.errors import (
CodeMessageException, MatrixCodeMessageException, SynapseError, Codes, CodeMessageException, MatrixCodeMessageException, SynapseError, Codes,
) )
from synapse.http import cancelled_to_request_timed_out_error from synapse.http import cancelled_to_request_timed_out_error
from synapse.http.site import ACCESS_TOKEN_RE
from synapse.util.async import add_timeout_to_deferred from synapse.util.async import add_timeout_to_deferred
from synapse.util.caches import CACHE_SIZE_FACTOR from synapse.util.caches import CACHE_SIZE_FACTOR
from synapse.util.logcontext import make_deferred_yieldable from synapse.util.logcontext import make_deferred_yieldable
...@@ -90,7 +91,11 @@ class SimpleHttpClient(object): ...@@ -90,7 +91,11 @@ class SimpleHttpClient(object):
# counters to it # counters to it
outgoing_requests_counter.labels(method).inc() outgoing_requests_counter.labels(method).inc()
logger.info("Sending request %s %s", method, uri) # log request but strip `access_token` (AS requests for example include this)
logger.info("Sending request %s %s", method, ACCESS_TOKEN_RE.sub(
r'\1<redacted>\3',
uri
))
try: try:
request_deferred = self.agent.request( request_deferred = self.agent.request(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment