This is an automated email from the ASF dual-hosted git repository.
mlibbey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 1a7ca941a5 XDebug Probe missing comma prevents valid json (#12435)
1a7ca941a5 is described below
commit 1a7ca941a53b00511034b214cb8b02d3267bf625
Author: mlibbey <[email protected]>
AuthorDate: Mon Aug 11 15:52:22 2025 -0400
XDebug Probe missing comma prevents valid json (#12435)
The Probe setting outputs a mix of text and json in the body, but, the json
is invalid as it misses a comma. For instance:
```
--- ATS xDebug Probe Injection Boundary ---
{'xDebugProbeAt' : 'myats.example.com'
'captured':[{'type':'response', 'side':'server', 'headers': {
```
---
plugins/xdebug/xdebug_transforms.cc | 4 +--
.../gold_tests/pluginTest/xdebug/x_remap/out.gold | 36 +++++++++++-----------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/plugins/xdebug/xdebug_transforms.cc
b/plugins/xdebug/xdebug_transforms.cc
index 0e45e901c0..3c4fe1c79f 100644
--- a/plugins/xdebug/xdebug_transforms.cc
+++ b/plugins/xdebug/xdebug_transforms.cc
@@ -34,7 +34,7 @@ static std::string
getPreBody(TSHttpTxn txn)
{
std::stringstream output;
- output << "{'xDebugProbeAt' : '" << Hostname << "'\n 'captured':[";
+ output << "{'xDebugProbeAt' : '" << Hostname << "',\n 'captured':[";
print_request_headers(txn, output);
output << "\n ]\n}";
output << MultipartBoundary;
@@ -46,7 +46,7 @@ getPostBody(TSHttpTxn txn)
{
std::stringstream output;
output << MultipartBoundary;
- output << "{'xDebugProbeAt' : '" << Hostname << "'\n 'captured':[";
+ output << "{'xDebugProbeAt' : '" << Hostname << "',\n 'captured':[";
print_response_headers(txn, output);
output << "\n ]\n}";
return output.str();
diff --git a/tests/gold_tests/pluginTest/xdebug/x_remap/out.gold
b/tests/gold_tests/pluginTest/xdebug/x_remap/out.gold
index 7cd12e1ec5..fd62fbb88f 100644
--- a/tests/gold_tests/pluginTest/xdebug/x_remap/out.gold
+++ b/tests/gold_tests/pluginTest/xdebug/x_remap/out.gold
@@ -37,7 +37,7 @@ X-Remap: from=http://one/, to=http://127.0.0.1:SERVER_PORT/
Content-Type: text/plain
``
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'request', 'side':'client', 'headers': {
'Start-Line' : 'GET http://127.0.0.1:SERVER_PORT/argh HTTP/1.1',
'Host' : '127.0.0.1:SERVER_PORT',
@@ -56,7 +56,7 @@ Content-Type: text/plain
--- ATS xDebug Probe Injection Boundary ---
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'response', 'side':'server', 'headers': {
'Start-Line' : 'HTTP/1.1 200 OK',
'Connection' : 'close',
@@ -86,7 +86,7 @@ X-Remap: from=http://two/, to=http://127.0.0.1:SERVER_PORT/
Content-Type: text/plain
``
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'request', 'side':'client', 'headers': {
'Start-Line' : 'GET http://127.0.0.1:SERVER_PORT/argh HTTP/1.1',
'Host' : '127.0.0.1:SERVER_PORT',
@@ -105,7 +105,7 @@ Content-Type: text/plain
--- ATS xDebug Probe Injection Boundary ---
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'response', 'side':'server', 'headers': {
'Start-Line' : 'HTTP/1.1 200 OK',
'Connection' : 'close',
@@ -135,7 +135,7 @@ X-Remap: from=http://three[0-9]+/,
to=http://127.0.0.1:SERVER_PORT/
Content-Type: text/plain
``
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'request', 'side':'client', 'headers': {
'Start-Line' : 'GET http://127.0.0.1:SERVER_PORT/argh HTTP/1.1',
'Host' : '127.0.0.1:SERVER_PORT',
@@ -154,7 +154,7 @@ Content-Type: text/plain
--- ATS xDebug Probe Injection Boundary ---
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'response', 'side':'server', 'headers': {
'Start-Line' : 'HTTP/1.1 200 OK',
'Connection' : 'close',
@@ -184,7 +184,7 @@ X-Remap: from=http://two/, to=http://127.0.0.1:SERVER_PORT/
Content-Type: text/plain
``
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'request', 'side':'client', 'headers': {
'Start-Line' : 'GET http://127.0.0.1:SERVER_PORT/not_there HTTP/1.1',
'Host' : '127.0.0.1:SERVER_PORT',
@@ -203,7 +203,7 @@ Content-Type: text/plain
--- ATS xDebug Probe Injection Boundary ---
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'response', 'side':'server', 'headers': {
'Start-Line' : 'HTTP/1.1 404 Not Found',
'Server' : 'MicroServer',
@@ -234,7 +234,7 @@ X-Remap: from=http://two/, to=http://127.0.0.1:SERVER_PORT/
Content-Type: text/plain
``
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'request', 'side':'client', 'headers': {
'Start-Line' : 'GET http://127.0.0.1:SERVER_PORT/argh HTTP/1.1',
'Host' : '127.0.0.1:SERVER_PORT',
@@ -255,7 +255,7 @@ Content-Type: text/plain
--- ATS xDebug Probe Injection Boundary ---
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'response', 'side':'server', 'headers': {
'Start-Line' : 'HTTP/1.1 200 OK',
'Connection' : 'close',
@@ -285,7 +285,7 @@ X-Remap: from=http://two/, to=http://127.0.0.1:SERVER_PORT/
Content-Type: text/plain
``
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'request', 'side':'client', 'headers': {
'Start-Line' : 'GET http://127.0.0.1:SERVER_PORT/argh HTTP/1.1',
'Host' : '127.0.0.1:SERVER_PORT',
@@ -304,7 +304,7 @@ Content-Type: text/plain
--- ATS xDebug Probe Injection Boundary ---
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'response', 'side':'server', 'headers': {
'Start-Line' : 'HTTP/1.1 200 OK',
'Connection' : 'close',
@@ -334,7 +334,7 @@ X-Remap: from=http://two/, to=http://127.0.0.1:SERVER_PORT/
Content-Type: text/plain
``
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'request', 'side':'client', 'headers': {
'Start-Line' : 'GET http://127.0.0.1:SERVER_PORT/argh HTTP/1.1',
'Host' : '127.0.0.1:SERVER_PORT',
@@ -355,7 +355,7 @@ Content-Type: text/plain
--- ATS xDebug Probe Injection Boundary ---
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'response', 'side':'server', 'headers': {
'Start-Line' : 'HTTP/1.1 200 OK',
'Connection' : 'close',
@@ -385,7 +385,7 @@ X-Remap: from=http://two/, to=http://127.0.0.1:SERVER_PORT/
Content-Type: text/plain
``
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'request', 'side':'client', 'headers': {
'Start-Line' : 'GET http://127.0.0.1:SERVER_PORT/argh HTTP/1.1',
'Host' : '127.0.0.1:SERVER_PORT',
@@ -406,7 +406,7 @@ Content-Type: text/plain
--- ATS xDebug Probe Injection Boundary ---
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'response', 'side':'server', 'headers': {
'Start-Line' : 'HTTP/1.1 200 OK',
'Connection' : 'close',
@@ -436,7 +436,7 @@ X-Remap: from=http://two/, to=http://127.0.0.1:SERVER_PORT/
Content-Type: text/plain
``
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'request', 'side':'client', 'headers': {
'Start-Line' : 'GET http://127.0.0.1:SERVER_PORT/argh HTTP/1.1',
'Host' : '127.0.0.1:SERVER_PORT',
@@ -455,7 +455,7 @@ Content-Type: text/plain
--- ATS xDebug Probe Injection Boundary ---
-{'xDebugProbeAt' : '``
+{'xDebugProbeAt' : '``',
'captured':[{'type':'response', 'side':'server', 'headers': {
'Start-Line' : 'HTTP/1.1 200 OK',
'Connection' : 'close',
