changed instances of \s* with \s? in regular expressions to reduce th…

…e risk of potential catastrophic backtracking vulnerability (audit courtesy of James Davis)
dperini · Mar 5, 2018 · 9dcc2b0 · 9dcc2b0
1 parent 4d6967c
commit 9dcc2b0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/nwmatcher-noqsa.js b/src/nwmatcher-noqsa.js
@@ -76,12 +76,12 @@
   Optimize, identifier, extensions = '.+',
 
   Patterns = {
-    spseudos: /^\:(root|empty|(?:first|last|only)(?:-child|-of-type)|nth(?:-last)?(?:-child|-of-type)\(\s*(even|odd|(?:[-+]{0,1}\d*n\s*)?[-+]{0,1}\s*\d*)\s*\))?(.*)/i,
-    dpseudos: /^\:(link|visited|target|active|focus|hover|checked|disabled|enabled|selected|lang\(([-\w]{2,})\)|(?:matches|not)\(\s*(:nth(?:-last)?(?:-child|-of-type)\(\s*(?:even|odd|(?:[-+]{0,1}\d*n\s*)?[-+]{0,1}\s*\d*)\s*\)|[^()]*)\s*\))?(.*)/i,
+    spseudos: /^\:(root|empty|(?:first|last|only)(?:-child|-of-type)|nth(?:-last)?(?:-child|-of-type)\(\s?(even|odd|(?:[-+]{0,1}\d*n\s?)?[-+]{0,1}\s?\d*)\s?\))?(.*)/i,
+    dpseudos: /^\:(link|visited|target|active|focus|hover|checked|disabled|enabled|selected|lang\(([-\w]{2,})\)|(?:matches|not)\(\s?(:nth(?:-last)?(?:-child|-of-type)\(\s?(?:even|odd|(?:[-+]{0,1}\d*n\s?)?[-+]{0,1}\s?\d*)\s?\)|[^()]*)\s?\))?(.*)/i,
     epseudos: /^((?:[:]{1,2}(?:after|before|first-letter|first-line))|(?:[:]{2,2}(?:selection|backdrop|placeholder)))?(.*)/i,
-    children: RegExp('^' + whitespace + '*\\>' + whitespace + '*(.*)'),
-    adjacent: RegExp('^' + whitespace + '*\\+' + whitespace + '*(.*)'),
-    relative: RegExp('^' + whitespace + '*\\~' + whitespace + '*(.*)'),
+    children: RegExp('^' + whitespace + '?\\>' + whitespace + '?(.*)'),
+    adjacent: RegExp('^' + whitespace + '?\\+' + whitespace + '?(.*)'),
+    relative: RegExp('^' + whitespace + '?\\~' + whitespace + '?(.*)'),
     ancestor: RegExp('^' + whitespace + '+(.*)'),
     universal: RegExp('^\\*(.*)')
   },

diff --git a/src/nwmatcher.js b/src/nwmatcher.js
@@ -121,17 +121,17 @@
   // precompiled Regular Expressions
   Patterns = {
     // structural pseudo-classes and child selectors
-    spseudos: /^\:(root|empty|(?:first|last|only)(?:-child|-of-type)|nth(?:-last)?(?:-child|-of-type)\(\s*(even|odd|(?:[-+]{0,1}\d*n\s*)?[-+]{0,1}\s*\d*)\s*\))?(.*)/i,
+    spseudos: /^\:(root|empty|(?:first|last|only)(?:-child|-of-type)|nth(?:-last)?(?:-child|-of-type)\(\s?(even|odd|(?:[-+]{0,1}\d*n\s?)?[-+]{0,1}\s?\d*)\s?\))?(.*)/i,
     // uistates + dynamic + negation pseudo-classes
-    dpseudos: /^\:(link|visited|target|active|focus|hover|checked|disabled|enabled|selected|lang\(([-\w]{2,})\)|(?:matches|not)\(\s*(:nth(?:-last)?(?:-child|-of-type)\(\s*(?:even|odd|(?:[-+]{0,1}\d*n\s*)?[-+]{0,1}\s*\d*)\s*\)|[^()]*)\s*\))?(.*)/i,
+    dpseudos: /^\:(link|visited|target|active|focus|hover|checked|disabled|enabled|selected|lang\(([-\w]{2,})\)|(?:matches|not)\(\s?(:nth(?:-last)?(?:-child|-of-type)\(\s?(?:even|odd|(?:[-+]{0,1}\d*n\s?)?[-+]{0,1}\s?\d*)\s?\)|[^()]*)\s?\))?(.*)/i,
     // pseudo-elements selectors
     epseudos: /^((?:[:]{1,2}(?:after|before|first-letter|first-line))|(?:[:]{2,2}(?:selection|backdrop|placeholder)))?(.*)/i,
     // E > F
-    children: RegExp('^' + whitespace + '*\\>' + whitespace + '*(.*)'),
+    children: RegExp('^' + whitespace + '?\\>' + whitespace + '?(.*)'),
     // E + F
-    adjacent: RegExp('^' + whitespace + '*\\+' + whitespace + '*(.*)'),
+    adjacent: RegExp('^' + whitespace + '?\\+' + whitespace + '?(.*)'),
     // E ~ F
-    relative: RegExp('^' + whitespace + '*\\~' + whitespace + '*(.*)'),
+    relative: RegExp('^' + whitespace + '?\\~' + whitespace + '?(.*)'),
     // E F
     ancestor: RegExp('^' + whitespace + '+(.*)'),
     // all