From: Yusuke Endoh <mame@ruby-lang.org>
Date: Tue, 29 Sep 2020 04:15:58 +0000 (+0900)
Subject: [PATCH] Make it more strict to interpret some headers
X-Git-Tag: archive/raspbian/2.3.3-1+deb9u9+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=19f833dbb5ec21e291ec6ad61c9cb76f261d1907;p=ruby2.3.git

[PATCH] Make it more strict to interpret some headers

Some regexps were too tolerant.


Gbp-Pq: Name CVE-2020-25613.patch
---

diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb
index 6fc85a4..86140ab 100644
--- a/lib/webrick/httprequest.rb
+++ b/lib/webrick/httprequest.rb
@@ -226,9 +226,9 @@ module WEBrick
         raise HTTPStatus::BadRequest, "bad URI `#{@unparsed_uri}'."
       end
 
-      if /close/io =~ self["connection"]
+      if /\Aclose\z/io =~ self["connection"]
         @keep_alive = false
-      elsif /keep-alive/io =~ self["connection"]
+      elsif /\Akeep-alive\z/io =~ self["connection"]
         @keep_alive = true
       elsif @http_version < "1.1"
         @keep_alive = false
@@ -475,7 +475,7 @@ module WEBrick
       return unless socket
       if tc = self['transfer-encoding']
         case tc
-        when /chunked/io then read_chunked(socket, block)
+        when /\Achunked\z/io then read_chunked(socket, block)
         else raise HTTPStatus::NotImplemented, "Transfer-Encoding: #{tc}."
         end
       elsif self['content-length'] || @remaining_size