Merge pull request #136 from jcmuller/fix-regex-catastrophic-backtracking-fix

mpalmer · web-flow · commit 5cbbfb8dd370 · 2017-10-01T12:35:32.000+11:00
Replace regex without catastrophic backtracking
diff --git a/lib/rack/contrib/jsonp.rb b/lib/rack/contrib/jsonp.rb
@@ -7,8 +7,7 @@ module Rack
   class JSONP
     include Rack::Utils
 
-    VALID_JS_VAR    = /[a-zA-Z_$][\w$]*/
-    VALID_CALLBACK  = /\A#{VALID_JS_VAR}(?:\.?#{VALID_JS_VAR})*\z/
+    VALID_CALLBACK = /\A[a-zA-Z_$](?:\.?[\w$])*\z/
 
     # These hold the Unicode characters \u2028 and \u2029.
     #

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,7 @@ module Rack`
`7`	`7`	`class JSONP`
`8`	`8`	`include Rack::Utils`
`9`	`9`
`10`		`- VALID_JS_VAR = /[a-zA-Z_$][\w$]*/`
`11`		`- VALID_CALLBACK = /\A#{VALID_JS_VAR}(?:\.?#{VALID_JS_VAR})*\z/`
	`10`	`+ VALID_CALLBACK = /\A[a-zA-Z_$](?:\.?[\w$])*\z/`
`12`	`11`
`13`	`12`	`# These hold the Unicode characters \u2028 and \u2029.`
`14`	`13`	`#`