Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

in_opentelemetry: handle missing or invalid content-type headers in metrics and traces handlers #8986

Merged
merged 2 commits into from
Jun 24, 2024
Merged

in_opentelemetry: handle missing or invalid content-type headers in metrics and traces handlers #8986

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f48284e
fix: add null content-type header check to traces and metrics endpoints
portswigger-tim Jun 20, 2024
b791fc7
fix: handle unsupported content-types
portswigger-tim Jun 20, 2024
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
28 changes: 26 additions & 2 deletions plugins/in_opentelemetry/opentelemetry_prot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2175,6 +2175,12 @@ static int process_payload_metrics_ng(struct flb_opentelemetry *ctx,

offset = 0;

if (request->content_type == NULL) {
flb_error("[otel] content type missing");

return -1;
}

if (strcasecmp(request->content_type, "application/grpc") == 0) {
if (cfl_sds_len(request->body) < 5) {
return -1;
Expand All @@ -2185,12 +2191,18 @@ static int process_payload_metrics_ng(struct flb_opentelemetry *ctx,
cfl_sds_len(request->body) - 5,
&offset);
}
else {
else if (strcasecmp(request->content_type, "application/x-protobuf") == 0 ||
strcasecmp(request->content_type, "application/json") == 0) {
result = cmt_decode_opentelemetry_create(&decoded_contexts,
request->body,
cfl_sds_len(request->body),
&offset);
}
else {
flb_plg_error(ctx->ins, "Unsupported content type %s", request->content_type);

return -1;
}

if (result == CMT_DECODE_OPENTELEMETRY_SUCCESS) {
cfl_list_foreach(iterator, &decoded_contexts) {
Expand Down Expand Up @@ -2221,6 +2233,12 @@ static int process_payload_traces_proto_ng(struct flb_opentelemetry *ctx,

offset = 0;

if (request->content_type == NULL) {
flb_error("[otel] content type missing");

return -1;
}

if (strcasecmp(request->content_type, "application/grpc") == 0) {
if (cfl_sds_len(request->body) < 5) {
return -1;
Expand All @@ -2231,12 +2249,18 @@ static int process_payload_traces_proto_ng(struct flb_opentelemetry *ctx,
cfl_sds_len(request->body) - 5,
&offset);
}
else {
else if (strcasecmp(request->content_type, "application/x-protobuf") == 0 ||
strcasecmp(request->content_type, "application/json") == 0) {
result = ctr_decode_opentelemetry_create(&decoded_context,
request->body,
cfl_sds_len(request->body),
&offset);
}
else {
flb_plg_error(ctx->ins, "Unsupported content type %s", request->content_type);

return -1;
}

if (result == 0) {
result = flb_input_trace_append(ctx->ins, NULL, 0, decoded_context);
Expand Down
Loading