GHSL-2021-113: Fix ReDoS bug (second attempt).

kevinbackhouse · kevinbackhouse · commit 19c5862299b6 · 2021-12-08T11:08:37.000Z
diff --git a/js/src/javascript/tokenizer.js b/js/src/javascript/tokenizer.js
@@ -126,7 +126,7 @@ var Tokenizer = function(input_string, options) {
     html_comment_end: pattern_reader.matching(/-->/),
     include: pattern_reader.starting_with(/#include/).until_after(acorn.lineBreak),
     shebang: pattern_reader.starting_with(/#!/).until_after(acorn.lineBreak),
-    xml: pattern_reader.matching(/[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\]|)(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{[\s\S]+?}))*\s*(\/?)\s*>/),
+    xml: pattern_reader.matching(/[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[^}]+?}|!\[CDATA\[[^\]]*?\]\]|)(\s*{[^}]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{([^{}]|{[^}]+?})+?}))*\s*(\/?)\s*>/),
     single_quote: templatable.until(/['\\\n\r\u2028\u2029]/),
     double_quote: templatable.until(/["\\\n\r\u2028\u2029]/),
     template_text: templatable.until(/[`\\$]/),
diff --git a/python/jsbeautifier/javascript/tokenizer.py b/python/jsbeautifier/javascript/tokenizer.py
@@ -119,7 +119,7 @@ def __init__(self):
 directives_core = Directives(r"/\*", r"\*/")
 
 xmlRegExp = re.compile(
-    r'[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\]|)(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*(\'[^\']*\'|"[^"]*"|{[\s\S]+?}))*\s*(/?)\s*>'
+    r'[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[^}]+?}|!\[CDATA\[[^\]]*?\]\]|)(\s*{[^}]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*(\'[^\']*\'|"[^"]*"|{([^{}]|{[^}]+?})+?}))*\s*(\/?)\s*>'
 )
 
 

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ def __init__(self):`
`119`	`119`	`directives_core = Directives(r"/\", r"\/")`
`120`	`120`
`121`	`121`	`xmlRegExp = re.compile(`
`122`		`- r'[\s\S]?<(\/?)([-a-zA-Z:0-9_.]+\|{[\s\S]+?}\|!\[CDATA\[[\s\S]?\]\]\|)(\s+{[\s\S]+?}\|\s+[-a-zA-Z:0-9_.]+\|\s+[-a-zA-Z:0-9_.]+\s=\s(\'[^\']\'\|"[^"]"\|{[\s\S]+?}))\s(/?)\s*>'`
	`122`	`+ r'[\s\S]?<(\/?)([-a-zA-Z:0-9_.]+\|{[^}]+?}\|!\[CDATA\[[^\]]?\]\]\|)(\s{[^}]+?}\|\s+[-a-zA-Z:0-9_.]+\|\s+[-a-zA-Z:0-9_.]+\s=\s(\'[^\']\'\|"[^"]"\|{([^{}]\|{[^}]+?})+?}))\s(\/?)\s>'`
`123`	`123`	`)`
`124`	`124`
`125`	`125`