Fix regex warnings in const.rb & test_launcher.rb

Fix Puma::Const::ILLEGAL_HEADER_KEY_REGEX overlap Add backslash as illegal character for header field-name See puma#2495 and puma#2439 Update test_launcher.rb, use parenthesis with regex parameters
MSP-Greg · Nov 28, 2020 · f0fdb86 · f0fdb86
1 parent 5a988f1
commit f0fdb86
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/puma/const.rb b/lib/puma/const.rb
@@ -240,9 +240,10 @@ module Const
 
     # Illegal character in the key or value of response header
     DQUOTE = "\"".freeze
-    HTTP_HEADER_DELIMITER = Regexp.escape("(),/:;<=>?@[]{}").freeze
-    ILLEGAL_HEADER_KEY_REGEX = /(\u0000-\u0025|#{DQUOTE}|#{HTTP_HEADER_DELIMITER})/.freeze
-    ILLEGAL_HEADER_VALUE_REGEX = /[\000-\037]/.freeze
+    HTTP_HEADER_DELIMITER = Regexp.escape("(),/:;<=>?@[]{}\\").freeze
+    ILLEGAL_HEADER_KEY_REGEX = /[\x00-\x20#{DQUOTE}#{HTTP_HEADER_DELIMITER}]/.freeze
+    # header values can contain HTAB?
+    ILLEGAL_HEADER_VALUE_REGEX = /[\x00-\x08\x0A-\x1F]/.freeze
 
     # Banned keys of response header
     BANNED_HEADER_KEY = /rack.|status/.freeze

diff --git a/test/test_launcher.rb b/test/test_launcher.rb
@@ -171,7 +171,7 @@ def test_log_config_enabled
   end
 
   def test_log_config_disabled
-    refute_match /Configuration:/, launcher.events.stdout.string
+    refute_match(/Configuration:/, launcher.events.stdout.string)
   end
 
   private
-Original file line number
+Diff line change
@@ Expand Up / @@ -171,7 +171,7 @@ def test_log_config_enabled @@
       end
       def test_log_config_disabled
-        refute_match /Configuration:/, launcher.events.stdout.string
+        refute_match(/Configuration:/, launcher.events.stdout.string)
       end
       private
@@ Expand Down @@