Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions ext/handlers_http.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,17 @@ static inline zend_string *ddtrace_format_tracestate(zend_string *tracestate, ui
smart_str_appendc(&str, ';');
}
smart_str_appends(&str, "o:");
signed char *cur = (signed char *)ZSTR_VAL(str.s) + ZSTR_LEN(str.s);
size_t origin_offset = ZSTR_LEN(str.s);
smart_str_append(&str, origin);
for (signed char *end = (signed char *)ZSTR_VAL(str.s) + ZSTR_LEN(str.s); cur < end; ++cur) {
if (*cur == '=') {
*cur = '~';
} else if (*cur < 0x20 || *cur == ',' || *cur == ';' || *cur == '~') {
*cur = '_';
{
signed char *cur = (signed char *)ZSTR_VAL(str.s) + origin_offset;
signed char *end = (signed char *)ZSTR_VAL(str.s) + ZSTR_LEN(str.s);
for (; cur < end; ++cur) {
if (*cur == '=') {
*cur = '~';
} else if (*cur < 0x20 || *cur == ',' || *cur == ';' || *cur == '~') {
*cur = '_';
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
--TEST--
SpanLink::fromHeaders handles long propagated origins
--DESCRIPTION--
Formatting a propagated origin into tracestate sanitizes the origin after
appending it to a smart_str. The sanitizer must not keep a pointer into the
smart_str across the append, because a long origin can reallocate the buffer
before sanitization.
--INI--
datadog.trace.enabled=1
datadog.trace.generate_root_span=0
datadog.trace.propagation_style_extract=datadog
--FILE--
<?php

$origin = str_repeat("=", 1000);
$link = DDTrace\SpanLink::fromHeaders([
"x-datadog-trace-id" => "42",
"x-datadog-parent-id" => "1",
"x-datadog-origin" => $origin,
]);

$traceState = $link->traceState;
$traceStatePrefix = "dd=o:";
$formattedOrigin = substr($traceState, strlen($traceStatePrefix));

var_dump(substr($traceState, 0, strlen($traceStatePrefix)));
var_dump(substr_count($traceState, "="));
var_dump($formattedOrigin === str_repeat("~", strlen($formattedOrigin)));
var_dump(strlen($formattedOrigin) > 256);

?>
--EXPECT--
string(5) "dd=o:"
int(1)
bool(true)
bool(true)
Loading