mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-24 23:31:40 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: stats: escape some strings in the CSV dump

Browse Source 
Some strings which must be dumped in the CSV output can contain one of
the following chars : <,>, <">, or CR/LF. This patch escapes these
strings if the case is encountered.
This commit is contained in:
Thierry FOURNIER 2015-05-28 16:02:01 +02:00 committed by Willy Tarreau
parent ddea626de4
commit be1ccaea92
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/dumpstats.c
View File

@ -3329,6 +3329,7 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in
chunk_appendf(&trash, "<td class=ac>-</td></tr>\n"); chunk_appendf(&trash, "<td class=ac>-</td></tr>\n");
} }
else { /* CSV mode */ else { /* CSV mode */
struct chunk *out = get_trash_chunk();
static char *srv_hlt_st[SRV_STATS_STATE_COUNT] = { static char *srv_hlt_st[SRV_STATS_STATE_COUNT] = {
[SRV_STATS_STATE_DOWN] = "DOWN,", [SRV_STATS_STATE_DOWN] = "DOWN,",
[SRV_STATS_STATE_DOWN_AGENT] = "DOWN (agent),", [SRV_STATS_STATE_DOWN_AGENT] = "DOWN (agent),",
@ -3426,7 +3427,7 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in
if (sv->check.state & CHK_ST_ENABLED) { if (sv->check.state & CHK_ST_ENABLED) {
/* check_status */ /* check_status */
chunk_appendf(&trash, "%s,", get_check_status_info(sv->check.status)); chunk_appendf(&trash, "%s,", csv_enc(get_check_status_info(sv->check.status), 1, out));
/* check_code */ /* check_code */
if (sv->check.status >= HCHK_STATUS_L57DATA) if (sv->check.status >= HCHK_STATUS_L57DATA)
@ -3471,8 +3472,8 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in
chunk_appendf(&trash, "%d,", srv_lastsession(sv)); chunk_appendf(&trash, "%d,", srv_lastsession(sv));
/* capture of last check and agent statuses */ /* capture of last check and agent statuses */
chunk_appendf(&trash, "%s,", ((sv->check.state & (CHK_ST_ENABLED|CHK_ST_PAUSED)) == CHK_ST_ENABLED) ? cstr(sv->check.desc) : ""); chunk_appendf(&trash, "%s,", ((sv->check.state & (CHK_ST_ENABLED|CHK_ST_PAUSED)) == CHK_ST_ENABLED) ? csv_enc(cstr(sv->check.desc), 1, out) : "");
chunk_appendf(&trash, "%s,", ((sv->agent.state & (CHK_ST_ENABLED|CHK_ST_PAUSED)) == CHK_ST_ENABLED) ? cstr(sv->agent.desc) : ""); chunk_appendf(&trash, "%s,", ((sv->agent.state & (CHK_ST_ENABLED|CHK_ST_PAUSED)) == CHK_ST_ENABLED) ? csv_enc(cstr(sv->agent.desc), 1, out) : "");
/* qtime, ctime, rtime, ttime, */ /* qtime, ctime, rtime, ttime, */
chunk_appendf(&trash, "%u,%u,%u,%u,", chunk_appendf(&trash, "%u,%u,%u,%u,",