Skip to content

[sds] add flb_sds_cat_replace: concatenate a string by replacing a set of chars #1365

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 4 commits into from
Jan 15, 2020
Merged

[sds] add flb_sds_cat_replace: concatenate a string by replacing a set of chars #1365

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ded3388
[sds] add flb_sds_cat_replace: concatenate a string by replacing a se…
manuelluis Jun 2, 2019
1bdbfa8
sds: remove flb_sds_cat_replace
manuelluis Sep 25, 2019
a535574
pack gelf: replace invalid key chars with '_'
manuelluis Sep 25, 2019
035afb5
sds: fix typo in flb_sds_cat_utf8 declaration
manuelluis Sep 25, 2019
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
110 changes: 28 additions & 82 deletions src/flb_pack_gelf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,6 @@
#include <fluent-bit/flb_info.h>
#include <fluent-bit/flb_pack.h>

static char *str_copy_replace(const char *src, int len, char search, char replace) {
char *dst = NULL;
int i;

dst = flb_strndup(src, len);

if (!dst) {
flb_errno();
return NULL;
}

for(i = 0; i < len; i++) {
if (dst[i] == search) {
dst[i] = replace;
}
}

return dst;
}

static flb_sds_t flb_msgpack_gelf_key(flb_sds_t *s, int in_array,
const char *prefix_key, int prefix_key_len,
int concat,
Expand All @@ -60,108 +40,74 @@ static flb_sds_t flb_msgpack_gelf_key(flb_sds_t *s, int in_array,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
char *prefix_key_copy = NULL;
char *key_copy = NULL;
flb_sds_t ret;

if (prefix_key_len > 0) {
prefix_key_copy = str_copy_replace(prefix_key, prefix_key_len, '/', '_');
if (!prefix_key_copy) {
ret = NULL;
goto cleanup;
}
}

if (key_len > 0) {
key_copy = str_copy_replace(key, key_len, '/', '_');
if (!key_copy) {
ret = NULL;
goto cleanup;
}
}

/* check valid key char [A-Za-z0-9_\.\-] */
for(i=0; i < prefix_key_len; i++) {
if (!valid_char[(unsigned char)prefix_key_copy[i]]) {
flb_error("[%s] invalid prefix key char at pos %d: '%.*s'", __FUNCTION__,
i, prefix_key_len, prefix_key);
ret = NULL;
goto cleanup;
}
}
for(i=0; i < key_len; i++) {
if (!valid_char[(unsigned char)key_copy[i]]) {
flb_error("[%s] invalid key char at pos %d: '%.*s'", __FUNCTION__,
i, key_len, key);
ret = NULL;
goto cleanup;
}
}
int start_len, end_len;

if (in_array == FLB_FALSE) {
tmp = flb_sds_cat(*s, ", \"", 3);
if (tmp == NULL) {
ret = NULL;
goto cleanup;
return NULL;
}
*s = tmp;
}

if (prefix_key_len > 0) {
tmp = flb_sds_cat(*s, prefix_key_copy, prefix_key_len);
start_len = flb_sds_len(*s);

tmp = flb_sds_cat(*s, prefix_key, prefix_key_len);
if (tmp == NULL) {
ret = NULL;
goto cleanup;
return NULL;
}
*s = tmp;

end_len = flb_sds_len(*s);
for(i=start_len; i < end_len; i++) {
if (!valid_char[(unsigned char)(*s)[i]]) {
(*s)[i] = '_';
}
}
}

if (concat == FLB_TRUE) {
tmp = flb_sds_cat(*s, "_", 1);
if (tmp == NULL) {
ret = NULL;
goto cleanup;
return NULL;
}
*s = tmp;
}

if (key_len > 0) {
tmp = flb_sds_cat(*s, key_copy, key_len);
start_len = flb_sds_len(*s);

tmp = flb_sds_cat(*s, key, key_len);
if (tmp == NULL) {
ret = NULL;
goto cleanup;
return NULL;
}
*s = tmp;

end_len = flb_sds_len(*s);
for(i=start_len; i < end_len; i++) {
if (!valid_char[(unsigned char)(*s)[i]]) {
(*s)[i] = '_';
}
}
}

if (in_array == FLB_FALSE) {
tmp = flb_sds_cat(*s, "\":", 2);
if (tmp == NULL) {
ret = NULL;
goto cleanup;
return NULL;
}
*s = tmp;
}
else {
tmp = flb_sds_cat(*s, "=", 1);
if (tmp == NULL) {
ret = NULL;
goto cleanup;
return NULL;
}
*s = tmp;
}

ret = *s;

cleanup:
if (prefix_key_copy) {
flb_free(prefix_key_copy);
}
if (key_copy) {
flb_free(key_copy);
}

return ret;
return *s;
}

static flb_sds_t flb_msgpack_gelf_value(flb_sds_t *s, int quote,
Expand Down