shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-09 01:18:19 +03:00
Code

ptyfwd: fix OSC sequence termination handling (#35640)

Browse Source 
Fixes #35631.
This commit is contained in:
Lennart Poettering 2024-12-16 15:41:32 +01:00 committed by GitHub
commit 9914b95a3f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/shared/ptyfwd.c
View File

@ -36,8 +36,7 @@ typedef enum AnsiColorState {
ANSI_COLOR_STATE_ESC,
ANSI_COLOR_STATE_CSI_SEQUENCE,
ANSI_COLOR_STATE_OSC_SEQUENCE,
ANSI_COLOR_STATE_NEWLINE,
ANSI_COLOR_STATE_CARRIAGE_RETURN,
ANSI_COLOR_STATE_OSC_SEQUENCE_TERMINATING,
_ANSI_COLOR_STATE_MAX,
_ANSI_COLOR_STATE_INVALID = -EINVAL,
} AnsiColorState;
@ -427,39 +426,33 @@ static int pty_forward_ansi_process(PTYForward *f, size_t offset) {
switch (f->ansi_color_state) {
case ANSI_COLOR_STATE_TEXT:
break;
case ANSI_COLOR_STATE_NEWLINE:
case ANSI_COLOR_STATE_CARRIAGE_RETURN:
/* Immediately after a newline (ASCII 10) or carriage return (ASCII 13) insert an
* ANSI sequence set the background color back. */
r = insert_background_color(f, i);
if (r < 0)
return r;
i += r;
if (IN_SET(c, '\n', '\r')) {
/* Immediately after a newline (ASCII 10) or carriage return (ASCII 13) insert an
* ANSI sequence set the background color back. */
r = insert_background_color(f, i+1);
if (r < 0)
return r;
i += r;
} else if (c == 0x1B) /* ESC */
f->ansi_color_state = ANSI_COLOR_STATE_ESC;
break;
case ANSI_COLOR_STATE_ESC:
if (c == '[') {
if (c == '[')
f->ansi_color_state = ANSI_COLOR_STATE_CSI_SEQUENCE;
continue;
} else if (c == ']') {
else if (c == ']')
f->ansi_color_state = ANSI_COLOR_STATE_OSC_SEQUENCE;
continue;
} else if (c == 'c') {
/* "Full reset" aka "Reset to initial state"*/
else if (c == 'c') {
/* "Full reset" aka "Reset to initial state" */
r = insert_background_color(f, i+1);
if (r < 0)
return r;
i += r;
f->ansi_color_state = ANSI_COLOR_STATE_TEXT;
continue;
}
} else
f->ansi_color_state = ANSI_COLOR_STATE_TEXT;
break;
case ANSI_COLOR_STATE_CSI_SEQUENCE:
@ -472,7 +465,7 @@ static int pty_forward_ansi_process(PTYForward *f, size_t offset) {
/* Safety check: lets not accept unbounded CSI sequences */
f->csi_sequence = mfree(f->csi_sequence);
break;
f->ansi_color_state = ANSI_COLOR_STATE_TEXT;
} else if (!strextend(&f->csi_sequence, CHAR_TO_STR(c)))
return -ENOMEM;
} else {
@ -498,7 +491,7 @@ static int pty_forward_ansi_process(PTYForward *f, size_t offset) {
f->csi_sequence = mfree(f->csi_sequence);
f->ansi_color_state = ANSI_COLOR_STATE_TEXT;
}
continue;
break;
case ANSI_COLOR_STATE_OSC_SEQUENCE:
@ -506,48 +499,52 @@ static int pty_forward_ansi_process(PTYForward *f, size_t offset) {
if (strlen_ptr(f->osc_sequence) >= ANSI_SEQUENCE_LENGTH_MAX) {
/* Safety check: lets not accept unbounded OSC sequences */
f->osc_sequence = mfree(f->osc_sequence);
break;
f->ansi_color_state = ANSI_COLOR_STATE_TEXT;
} else if (!strextend(&f->osc_sequence, CHAR_TO_STR(c)))
return -ENOMEM;
} else {
} else if (c == '\x07') {
/* Otherwise, the OSC sequence is over
*
* There are three documented ways to end an OSC sequence:
* 1. BEL aka ^G aka \x07
* 2. \x9c
* 3. \x1b\x5c
* since we cannot look ahead to see if the Esc is followed by a "\"
* we cut a corner here and assume it will be "\"e.
*
* Note that we do not support \x9c here, because that's also a valid UTF8
* codepoint, and that would create ambiguity. Various terminal emulators
* similar do not support it. */
if (IN_SET(c, '\x07', '\x1b')) {
r = insert_window_title_fix(f, i+1);
if (r < 0)
return r;
i += r;
}
r = insert_window_title_fix(f, i+1);
if (r < 0)
return r;
i += r;
f->osc_sequence = mfree(f->osc_sequence);
f->ansi_color_state = ANSI_COLOR_STATE_TEXT;
} else if (c == '\x1b')
/* See the comment above. */
f->ansi_color_state = ANSI_COLOR_STATE_OSC_SEQUENCE_TERMINATING;
else {
/* Unexpected or unsupported OSC sequence. */
f->osc_sequence = mfree(f->osc_sequence);
f->ansi_color_state = ANSI_COLOR_STATE_TEXT;
}
continue;
break;
case ANSI_COLOR_STATE_OSC_SEQUENCE_TERMINATING:
if (c == '\x5c') {
r = insert_window_title_fix(f, i+1);
if (r < 0)
return r;
i += r;
}
f->osc_sequence = mfree(f->osc_sequence);
f->ansi_color_state = ANSI_COLOR_STATE_TEXT;
break;
default:
assert_not_reached();
}
if (c == '\n')
f->ansi_color_state = ANSI_COLOR_STATE_NEWLINE;
else if (c == '\r')
f->ansi_color_state = ANSI_COLOR_STATE_CARRIAGE_RETURN;
else if (c == 0x1B) /* ESC */
f->ansi_color_state = ANSI_COLOR_STATE_ESC;
else
f->ansi_color_state = ANSI_COLOR_STATE_TEXT;
}
return 0;