Skip to content

Commit f644853

Browse files
dushyant-hada-90cursoragent
authored and
aduh95
committed
util: fix OSC 8 hyperlink stripping in stripVTControlCharacters
The bundled ansi-regex OSC pattern used a restrictive URI character class that failed when URIs contained RFC 3986-valid characters such as parentheses. Match OSC sequences generically as ESC ] ... ST, aligned with ansi-regex v6.2.0. Co-authored-by: Cursor <[email protected]> Signed-off-by: dushyant <[email protected]> PR-URL: #64319 Fixes: #64313 Reviewed-By: Aviv Keller <[email protected]>
1 parent 0afda47 commit f644853

2 files changed

Lines changed: 27 additions & 7 deletions

File tree

‎lib/internal/util/inspect.js‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -282,16 +282,14 @@ const meta = [
282282
];
283283

284284
// Regex used for ansi escape code splitting
285-
// Ref: https://github.com/chalk/ansi-regex/blob/f338e1814144efb950276aac84135ff86b72dc8e/index.js
285+
// Ref: https://github.com/chalk/ansi-regex/blob/72bc570aaf25fca25541b49c6a8564f3ec63e835/index.js
286286
// License: MIT by Sindre Sorhus <[email protected]>
287287
// Matches all ansi escape code sequences in a string
288288
const ansi = new RegExp(
289-
'[\\u001B\\u009B][[\\]()#;?]*' +
290-
'(?:(?:(?:(?:;[-a-zA-Z\\d\\/\\#&.:=?%@~_]+)*' +
291-
'|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/\\#&.:=?%@~_]*)*)?' +
292-
'(?:\\u0007|\\u001B\\u005C|\\u009C))' +
293-
'|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?' +
294-
'[\\dA-PR-TZcf-nq-uy=><~]))', 'g',
289+
'(?:\\u001B\\][\\s\\S]*?(?:\\u0007|\\u001B\\u005C|\\u009C))' +
290+
'|[\\u001B\\u009B][[\\]()#;?]*' +
291+
'(?:\\d{1,4}(?:[;:]\\d{0,4})*)?' +
292+
'[\\dA-PR-TZcf-nq-uy=><~]', 'g',
295293
);
296294

297295
let getStringWidth;

‎test/parallel/test-util-stripvtcontrolcharacters.js‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,31 @@ for (const ST of ['\u0007', '\u001B\u005C', '\u009C']) {
1818
tests.push(
1919
[`\u001B]8;;mailto:[email protected]${ST}mail\u001B]8;;${ST}`, 'mail'],
2020
[`\u001B]8;k=v;https://example-a.com/?a_b=1&c=2#tit%20le${ST}click\u001B]8;;${ST}`, 'click'],
21+
[`\u001B]8;;https://example.com/(foo${ST}label\u001B]8;;${ST}`, 'label'],
22+
[`\u001B]8;;https://example.com/foo)bar${ST}label\u001B]8;;${ST}`, 'label'],
23+
[`\u001B]8;;https://example.com/!foo${ST}label\u001B]8;;${ST}`, 'label'],
24+
[`\u001B]8;;https://example.com/foo+bar${ST}label\u001B]8;;${ST}`, 'label'],
25+
[`\u001B]8;;https://example.com/[foo]${ST}label\u001B]8;;${ST}`, 'label'],
26+
[`\u001B]8;;https://example.com/foo$bar${ST}label\u001B]8;;${ST}`, 'label'],
27+
[`\u001B]8;;https://example.com/foo'bar${ST}label\u001B]8;;${ST}`, 'label'],
28+
[`\u001B]8;;https://example.com/foo*bar${ST}label\u001B]8;;${ST}`, 'label'],
29+
[`\u001B]8;;https://example.com/foo,bar${ST}label\u001B]8;;${ST}`, 'label'],
2130
);
2231
}
2332

33+
// Colon-delimited CSI sub-parameters (SGR) should be stripped like the
34+
// semicolon-delimited form.
35+
tests.push(
36+
['\u001B[38:2:255:0:0mHello\u001B[0m', 'Hello'],
37+
['\u001B[4:3mUnderline\u001B[4:0m', 'Underline'],
38+
);
39+
40+
// Unterminated OSC does not match the OSC alternative; the CSI alternative may
41+
// still consume a short prefix (here ESC ] 8 ;; h), leaving the remainder.
42+
tests.push(
43+
['\u001B]8;;https://example.com/no-terminator', 'ttps://example.com/no-terminator'],
44+
);
45+
2446
test('util.stripVTControlCharacters', (t) => {
2547
for (const [before, expected] of tests) {
2648
t.assert.strictEqual(util.stripVTControlCharacters(before), expected);

0 commit comments

Comments
 (0)