Skip to content

Commit

Permalink
pack: on JSON formatting, remove duplicated keys (#1835 #1051)
Browse files Browse the repository at this point in the history
Our internal serialization format allows to have several keys with
the same name in a map. When converting to JSON the case is quite
dangerous, despite the JSON spec is not mandatory about having
unique keys at the same level in a map, we got tons of reports that
backend services that receives JSON payload raises exception due
to duplicated keys.

On this patch now the JSON formatter will check for duplicated
keys, if found, it preserves the latest one found.

Signed-off-by: Eduardo Silva <eduardo@treasure-data.com>
  • Loading branch information
edsiper committed Sep 30, 2020
1 parent 00e0742 commit 1d14886
Showing 1 changed file with 60 additions and 9 deletions.
69 changes: 60 additions & 9 deletions src/flb_pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -441,12 +441,46 @@ static inline int try_to_write(char *buf, int *off, size_t left,
return FLB_TRUE;
}


/*
* Check if a key exists in the map using the 'offset' as an index to define
* which element needs to start looking from
*/
static inline int key_exists_in_map(msgpack_object key, msgpack_object map, int offset)
{
int i;
msgpack_object p;

if (key.type != MSGPACK_OBJECT_STR) {
return FLB_FALSE;
}

for (i = offset; i < map.via.map.size; i++) {
p = map.via.map.ptr[i].key;
if (p.type != MSGPACK_OBJECT_STR) {
continue;
}

if (key.via.str.size != p.via.str.size) {
continue;
}

if (memcmp(key.via.str.ptr, p.via.str.ptr, p.via.str.size) == 0) {
return FLB_TRUE;
}
}

return FLB_FALSE;
}

static int msgpack2json(char *buf, int *off, size_t left,
const msgpack_object *o)
{
int ret = FLB_FALSE;
int i;
int dup;
int ret = FLB_FALSE;
int loop;
int packed;

switch(o->type) {
case MSGPACK_OBJECT_NIL:
Expand Down Expand Up @@ -558,21 +592,33 @@ static int msgpack2json(char *buf, int *off, size_t left,
goto msg2json_end;
}
if (loop != 0) {
msgpack_object k;
msgpack_object_kv *p = o->via.map.ptr;
if (!msgpack2json(buf, off, left, &p->key) ||
!try_to_write(buf, off, left, ":", 1) ||
!msgpack2json(buf, off, left, &p->val)) {
goto msg2json_end;
}
for (i = 1; i < loop; i++) {

packed = 0;
dup = FLB_FALSE;

k = o->via.map.ptr[0].key;
for (i = 0; i < loop; i++) {
k = o->via.map.ptr[i].key;
dup = key_exists_in_map(k, *o, i + 1);
if (dup == FLB_TRUE) {
continue;
}

if (packed > 0) {
if (!try_to_write(buf, off, left, ",", 1)) {
goto msg2json_end;
}
}

if (
!try_to_write(buf, off, left, ",", 1) ||
!msgpack2json(buf, off, left, &(p+i)->key) ||
!try_to_write(buf, off, left, ":", 1) ||
!msgpack2json(buf, off, left, &(p+i)->val) ) {
goto msg2json_end;

}
packed++;
}
}

Expand Down Expand Up @@ -907,6 +953,11 @@ flb_sds_t flb_pack_msgpack_to_json_format(const char *data, uint64_t bytes,
msgpack_sbuffer_destroy(&tmp_sbuf);
}

if (out_buf && flb_sds_len(out_buf) == 0) {
flb_sds_destroy(out_buf);
return NULL;
}

return out_buf;
}

Expand Down

0 comments on commit 1d14886

Please sign in to comment.