Skip to content

opentelemetry: validate JSON container value types #12131

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

Merged
edsiper merged 5 commits into from
Jul 30, 2026
Merged

opentelemetry: validate JSON container value types #12131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7bf93b
opentelemetry: validate JSON array value type
edsiper Jul 22, 2026
b390e49
tests: integration: cover invalid OTLP JSON array value
edsiper Jul 22, 2026
fa91c1a
opentelemetry: validate JSON container value types
edsiper Jul 22, 2026
b48c5b1
in_opentelemetry: remove unused JSON wrapper decoder
edsiper Jul 22, 2026
f16e3f8
tests: integration: cover invalid OTLP JSON containers
edsiper Jul 22, 2026
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
87 changes: 0 additions & 87 deletions plugins/in_opentelemetry/opentelemetry_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,93 +67,6 @@ int find_map_entry_by_key(msgpack_object_map *map,
return -1;
}

int json_payload_get_wrapped_value(msgpack_object *wrapper,
msgpack_object **value,
int *type)
{
int internal_type;
msgpack_object *kv_value;
msgpack_object_str *kv_key;
msgpack_object_map *map;

if (wrapper->type != MSGPACK_OBJECT_MAP) {
return -1;
}

map = &wrapper->via.map;
kv_value = NULL;
internal_type = -1;

if (map->size == 1) {
if (map->ptr[0].key.type == MSGPACK_OBJECT_STR) {
kv_value = &map->ptr[0].val;
kv_key = &map->ptr[0].key.via.str;

if (strncasecmp(kv_key->ptr, "stringValue", kv_key->size) == 0 ||
strncasecmp(kv_key->ptr, "string_value", kv_key->size) == 0) {
internal_type = MSGPACK_OBJECT_STR;
}
else if (strncasecmp(kv_key->ptr, "boolValue", kv_key->size) == 0 ||
strncasecmp(kv_key->ptr, "bool_value", kv_key->size) == 0) {
internal_type = MSGPACK_OBJECT_BOOLEAN;
}
else if (strncasecmp(kv_key->ptr, "intValue", kv_key->size) == 0 ||
strncasecmp(kv_key->ptr, "int_value", kv_key->size) == 0) {
internal_type = MSGPACK_OBJECT_POSITIVE_INTEGER;
}
else if (strncasecmp(kv_key->ptr, "doubleValue", kv_key->size) == 0 ||
strncasecmp(kv_key->ptr, "double_value", kv_key->size) == 0) {
internal_type = MSGPACK_OBJECT_FLOAT;
}
else if (strncasecmp(kv_key->ptr, "bytesValue", kv_key->size) == 0 ||
strncasecmp(kv_key->ptr, "bytes_value", kv_key->size) == 0) {
internal_type = MSGPACK_OBJECT_BIN;
}
else if (strncasecmp(kv_key->ptr, "arrayValue", kv_key->size) == 0 ||
strncasecmp(kv_key->ptr, "array_value", kv_key->size) == 0) {
internal_type = MSGPACK_OBJECT_ARRAY;
}
else if (strncasecmp(kv_key->ptr, "kvlistValue", kv_key->size) == 0 ||
strncasecmp(kv_key->ptr, "kvlist_value", kv_key->size) == 0) {
internal_type = MSGPACK_OBJECT_MAP;
}
}
}

if (internal_type != -1) {
if (type != NULL) {
*type = internal_type;
}

if (value != NULL) {
*value = kv_value;
}

if (kv_value->type == MSGPACK_OBJECT_MAP) {
map = &kv_value->via.map;

if (map->size == 1) {
kv_value = &map->ptr[0].val;
kv_key = &map->ptr[0].key.via.str;

if (strncasecmp(kv_key->ptr, "values", kv_key->size) == 0) {
if (value != NULL) {
*value = kv_value;
}
}
else {
return -3;
}
}
}
}
else {
return -2;
}

return 0;
}

static int opentelemetry_content_type_matches(const char *content_type,
const char *expected_content_type)
{
Expand Down
4 changes: 0 additions & 4 deletions plugins/in_opentelemetry/opentelemetry_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ int find_map_entry_by_key(msgpack_object_map *map,
size_t match_index,
int case_insensitive);

int json_payload_get_wrapped_value(msgpack_object *wrapper,
msgpack_object **value,
int *type);

int opentelemetry_is_grpc_content_type(const char *content_type);
int opentelemetry_is_json_content_type(const char *content_type);
int opentelemetry_is_protobuf_content_type(const char *content_type);
Expand Down
157 changes: 122 additions & 35 deletions src/opentelemetry/flb_opentelemetry_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,30 +164,47 @@ int flb_otel_utils_json_payload_get_wrapped_value(msgpack_object *wrapper,
*type = internal_type;
}

if (value != NULL) {
*value = kv_value;
}

if (kv_value->type == MSGPACK_OBJECT_MAP) {
map = &kv_value->via.map;

if (map->size == 1) {
if (map->size == 1)
{
if (map->ptr[0].key.type != MSGPACK_OBJECT_STR)
{
return -3;
}

kv_value = &map->ptr[0].val;
kv_key = &map->ptr[0].key.via.str;

if (strncasecmp(kv_key->ptr, "values", kv_key->size) == 0) {
if (value != NULL) {
*value = kv_value;
}
}
else {
if (kv_key->size != 6 ||
strncasecmp(kv_key->ptr, "values", 6) != 0)
{
return -3;
}
}
}

if (internal_type == MSGPACK_OBJECT_ARRAY &&
kv_value->type != MSGPACK_OBJECT_ARRAY &&
(kv_value->type != MSGPACK_OBJECT_MAP ||
kv_value->via.map.size != 0))
{
return -2;
Comment on lines +188 to +193

@chatgpt-codex-connector chatgpt-codex-connector Bot Jul 22, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Preserve omitted values as an empty array

When an OTLP/JSON client sends an empty ArrayValue as {"arrayValue": {}}, the protobuf JSON mapping omits the repeated values field, so this is a valid empty array. This new check returns -2 whenever the resolved array wrapper is a map rather than an array, so the log body path no longer unwraps it as [] and instead falls back to serializing the raw wrapper map; the same wrapper is also rejected by shared AnyValue callers. Please keep the empty-map wrapper case for arrayValue and only reject scalar/non-container values payloads.

Useful? React with 👍 / 👎.

}
else if (internal_type == MSGPACK_OBJECT_MAP &&
kv_value->type != MSGPACK_OBJECT_ARRAY &&
kv_value->type != MSGPACK_OBJECT_MAP)
{
return -2;
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

if (value != NULL) {
*value = kv_value;
}
}
else {
return -2;
return -1;
}

return 0;
Expand Down Expand Up @@ -329,17 +346,53 @@ int flb_otel_utils_json_payload_append_unwrapped_value(
else if (type == MSGPACK_OBJECT_BIN) {
unwrap_value = FLB_TRUE;
}
else if (type == MSGPACK_OBJECT_ARRAY) {
result = flb_otel_utils_json_payload_append_converted_array(encoder,
target_field,
value);
else if (type == MSGPACK_OBJECT_ARRAY)
{
if (value->type == MSGPACK_OBJECT_ARRAY)
{
result = flb_otel_utils_json_payload_append_converted_array(
encoder,
target_field,
value);
}
else if (value->type == MSGPACK_OBJECT_MAP &&
value->via.map.size == 0)
{
result = flb_log_event_encoder_begin_array(encoder, target_field);

if (result == FLB_EVENT_ENCODER_SUCCESS)
{
result = flb_log_event_encoder_commit_array(encoder, target_field);
}
}
else
{
return -2;
}
}
else if (type == MSGPACK_OBJECT_MAP) {
result = flb_otel_utils_json_payload_append_converted_kvlist(encoder,
target_field,
value);
else if (type == MSGPACK_OBJECT_MAP)
{
if (value->type == MSGPACK_OBJECT_ARRAY)
{
result = flb_otel_utils_json_payload_append_converted_kvlist(
encoder,
target_field,
value);
}
else if (value->type == MSGPACK_OBJECT_MAP)
{
result = flb_otel_utils_json_payload_append_converted_map(
encoder,
target_field,
value);
}
else
{
return -2;
}
}
else {
else
{
return -2;
}

Expand All @@ -353,11 +406,7 @@ int flb_otel_utils_json_payload_append_unwrapped_value(

return 0;
}
else {
return -1;
}

return -1;
return result;
}

int flb_otel_utils_json_payload_append_converted_map(
Expand All @@ -370,6 +419,11 @@ int flb_otel_utils_json_payload_append_converted_map(
size_t index;
msgpack_object_map *map;

if (encoder == NULL || object == NULL ||
object->type != MSGPACK_OBJECT_MAP) {
return FLB_EVENT_ENCODER_ERROR_INVALID_ARGUMENT;
}

map = &object->via.map;

result = flb_otel_utils_json_payload_append_unwrapped_value(
Expand All @@ -378,9 +432,14 @@ int flb_otel_utils_json_payload_append_converted_map(
object,
&encoder_result);

if (result == 0) {
if (result == 0)
{
return encoder_result;
}
else if (result != -1)
{
return FLB_EVENT_ENCODER_ERROR_INVALID_VALUE_TYPE;
}

result = flb_log_event_encoder_begin_map(encoder, target_field);

Expand Down Expand Up @@ -419,6 +478,12 @@ int flb_otel_utils_json_payload_append_converted_array(struct flb_log_event_enco
size_t index;
msgpack_object_array *array;

if (encoder == NULL || object == NULL ||
object->type != MSGPACK_OBJECT_ARRAY)
{
return FLB_EVENT_ENCODER_ERROR_INVALID_ARGUMENT;
}

array = &object->via.array;

result = flb_log_event_encoder_begin_array(encoder, target_field);
Expand Down Expand Up @@ -458,6 +523,12 @@ int flb_otel_utils_json_payload_append_converted_kvlist(
msgpack_object_array *array;
msgpack_object_map *entry;

if (encoder == NULL || object == NULL ||
object->type != MSGPACK_OBJECT_ARRAY)
{
return FLB_EVENT_ENCODER_ERROR_INVALID_ARGUMENT;
}

array = &object->via.array;

result = flb_log_event_encoder_begin_map(encoder, target_field);
Expand Down Expand Up @@ -842,26 +913,42 @@ static struct cfl_variant *convert_otlp_anyvalue_wrapper_to_cfl_variant(
value_object->via.bin.size,
CFL_FALSE);
}
else if (value_type == MSGPACK_OBJECT_ARRAY) {
if (value_object->type != MSGPACK_OBJECT_ARRAY) {
else if (value_type == MSGPACK_OBJECT_ARRAY)
{
if (value_object->type == MSGPACK_OBJECT_MAP &&
value_object->via.map.size == 0)
{
value_array = NULL;
array_instance = cfl_array_create(0);
}
else if (value_object->type == MSGPACK_OBJECT_ARRAY)
{
value_array = &value_object->via.array;
array_instance = cfl_array_create(value_array->size);
}
else
{
return NULL;
}

value_array = &value_object->via.array;
array_instance = cfl_array_create(value_array->size);
if (array_instance == NULL) {
if (array_instance == NULL)
{
return NULL;
}

for (index = 0 ; index < value_array->size ; index++) {
for (index = 0 ;
value_array != NULL && index < value_array->size ;
index++) {
child_variant = flb_otel_utils_msgpack_object_to_cfl_variant(
&value_array->ptr[index]);
if (child_variant == NULL) {
if (child_variant == NULL)
{
cfl_array_destroy(array_instance);
return NULL;
}

if (cfl_array_append(array_instance, child_variant) != 0) {
if (cfl_array_append(array_instance, child_variant) != 0)
{
cfl_variant_destroy(child_variant);
cfl_array_destroy(array_instance);
return NULL;
Expand Down
Loading
Loading