From 419250fa510bf31b4cc672e76537a64f9332e1f1 Mon Sep 17 00:00:00 2001 From: Yeting Li Date: Sat, 11 Sep 2021 04:23:24 +0800 Subject: [PATCH 1/3] Fix potential ReDoS (#37) --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index c4aaecf..93f162c 100644 --- a/index.js +++ b/index.js @@ -2,7 +2,7 @@ module.exports = () => { const pattern = [ - '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?\\u0007)', + '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[a-zA-Z\\d]*)*)?\\u0007)', '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PRZcf-ntqry=><~]))' ].join('|'); From c57d4c2fdbe0357a0f6dd42d1160defdc9fffdf5 Mon Sep 17 00:00:00 2001 From: Josh Junon Date: Sun, 27 Mar 2022 15:27:52 +0200 Subject: [PATCH 2/3] fix a few old XO issues for backport --- fixtures/ansi-codes.js | 2 +- fixtures/view-codes.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fixtures/ansi-codes.js b/fixtures/ansi-codes.js index 36bc04d..3a64fa4 100644 --- a/fixtures/ansi-codes.js +++ b/fixtures/ansi-codes.js @@ -213,7 +213,7 @@ exports.otherCode = new Map([ ['6n', ['Get cursor position', 'DSR']] ]); -// urxvt escapes +// URXVT escapes exports.urxvt = new Map([ ['[5~', ['URxvt.keysym.Prior']], ['[6~', ['URxvt.keysym.Next']], diff --git a/fixtures/view-codes.js b/fixtures/view-codes.js index a13105a..93a4dbf 100644 --- a/fixtures/view-codes.js +++ b/fixtures/view-codes.js @@ -1,3 +1,4 @@ +/* eslint-disable guard-for-in */ 'use strict'; const ansiRegex = require('..'); const ansiCodes = require('./ansi-codes'); From f545bdb80048f527889eddb9ac1a851c6f2a2241 Mon Sep 17 00:00:00 2001 From: Josh Junon Date: Sun, 27 Mar 2022 15:28:04 +0200 Subject: [PATCH 3/3] 3.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e94852f..0548619 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ansi-regex", - "version": "3.0.0", + "version": "3.0.1", "description": "Regular expression for matching ANSI escape codes", "license": "MIT", "repository": "chalk/ansi-regex",