From 9ca68b7b7a68636cf6a50457c09d6359a23e168c Mon Sep 17 00:00:00 2001 From: Jorik Schellekens Date: Thu, 18 Jul 2019 16:58:50 +0100 Subject: [PATCH 1/2] Don't accept opentracing data from clients. --- synapse/logging/opentracing.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/synapse/logging/opentracing.py b/synapse/logging/opentracing.py index 415040f5ee00..56d900080b19 100644 --- a/synapse/logging/opentracing.py +++ b/synapse/logging/opentracing.py @@ -340,8 +340,7 @@ def trace_servlet(servlet_name, func): @wraps(func) @defer.inlineCallbacks def _trace_servlet_inner(request, *args, **kwargs): - with start_active_span_from_context( - request.requestHeaders, + with start_active_span( "incoming-client-request", tags={ "request_id": request.get_request_id(), From bac546b84e934410ae5b7ea2a29778038a996342 Mon Sep 17 00:00:00 2001 From: Jorik Schellekens Date: Thu, 18 Jul 2019 17:03:42 +0100 Subject: [PATCH 2/2] newsfile --- changelog.d/5715.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/5715.misc diff --git a/changelog.d/5715.misc b/changelog.d/5715.misc new file mode 100644 index 000000000000..a77366e0c0ed --- /dev/null +++ b/changelog.d/5715.misc @@ -0,0 +1 @@ +Don't accept opentracing data from clients.