mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 00:57:02 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: cli: cli_snd_buf: preserve \r\n for payload lines

Browse Source 
cli_snd_buf() analyzez input line by line. Before this patch it has always
scanned a given line for the presence of '\r' followed by '\n'.

This is only needed for strings, that contain the commands itself like
"show ssl cert\n", "set ssl cert test.pem <<\n".

In case of strings, which contain the command's payload, like
"-----BEGIN CERTIFICATE-----\r\n", '\r\n' should be preserved
as is.

This patch fixes the GitHub issue #2818.

This patch should be backported in v3.1 and in v3.0.
This commit is contained in:
Valentine Krasnobaeva 2024-12-12 19:38:38 +01:00 committed by William Lallemand
parent 178109f608
commit d60c893991
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cli.c
View File

@ -962,19 +962,19 @@ size_t cli_snd_buf(struct appctx *appctx, struct buffer *buf, size_t count, unsi
if (str[len-1] == '\n') if (str[len-1] == '\n')
lf = 1; lf = 1;
/* Remove the trailing \r, if any and add a null byte at the
* end. For normal mode, the trailing \n is removed, but we
* conserve if for payload mode.
*/
len--; len--;
if (len && str[len-1] == '\r')
len--;
if (appctx->st1 & APPCTX_CLI_ST1_PAYLOAD) { if (appctx->st1 & APPCTX_CLI_ST1_PAYLOAD) {
str[len+1] = '\0'; str[len+1] = '\0';
b_add(&appctx->inbuf, len+1); b_add(&appctx->inbuf, len+1);
} }
else { else {
/* Remove the trailing \r, if any and add a null byte at the
* end. For normal mode, the trailing \n is removed, but we
* conserve \r\n or \n sequences for payload mode.
*/
if (len && str[len-1] == '\r')
len--;
str[len] = '\0'; str[len] = '\0';
b_add(&appctx->inbuf, len); b_add(&appctx->inbuf, len);
} }