diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-28 14:50:27 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-28 14:50:27 +0000 |
| commit | bbda1a027475bf7ce5e1a9583a7b55d0be71c8fe (patch) | |
| tree | 8dafb58b6ec6a18c1516d31ba53036af6128f4ea | |
| parent | a45622669bb1ff18d3ee9b411128acd839c4263e (diff) | |
merge revision(s) 62968:ruby_2_2
webrick: prevent response splitting and header injection
Original patch by tenderlove (with minor style adjustments).
* lib/webrick/httpresponse.rb (send_header): call check_header
(check_header): raise on embedded CRLF in header value
* test/webrick/test_httpresponse.rb
(test_prevent_response_splitting_headers): new test
* (test_prevent_response_splitting_cookie_headers): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@63022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | lib/webrick/httpresponse.rb | 27 | ||||
| -rw-r--r-- | test/webrick/test_httpresponse.rb | 22 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 60 insertions, 3 deletions
@@ -1,3 +1,15 @@ +Wed Mar 28 23:48:24 2018 Eric Wong <normalperson@yhbt.net> + + webrick: prevent response splitting and header injection + + Original patch by tenderlove (with minor style adjustments). + + * lib/webrick/httpresponse.rb (send_header): call check_header + (check_header): raise on embedded CRLF in header value + * test/webrick/test_httpresponse.rb + (test_prevent_response_splitting_headers): new test + * (test_prevent_response_splitting_cookie_headers): ditto + Wed Mar 28 23:45:36 2018 Eric Wong <normalperson@yhbt.net> webrick: use IO.copy_stream for multipart response diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb index 048929b0ec..4c30045713 100644 --- a/lib/webrick/httpresponse.rb +++ b/lib/webrick/httpresponse.rb @@ -20,6 +20,8 @@ module WEBrick # WEBrick HTTP Servlet. class HTTPResponse + class InvalidHeader < StandardError + end ## # HTTP Response version @@ -286,14 +288,19 @@ module WEBrick data = status_line() @header.each{|key, value| tmp = key.gsub(/\bwww|^te$|\b\w/){ $&.upcase } - data << "#{tmp}: #{value}" << CRLF + data << "#{tmp}: #{check_header(value)}" << CRLF } @cookies.each{|cookie| - data << "Set-Cookie: " << cookie.to_s << CRLF + data << "Set-Cookie: " << check_header(cookie.to_s) << CRLF } data << CRLF _write_data(socket, data) end + rescue InvalidHeader => e + @header.clear + @cookies.clear + set_error e + retry end ## @@ -353,6 +360,22 @@ module WEBrick host, port = @config[:ServerName], @config[:Port] end + error_body(backtrace, ex, host, port) + end + + private + + def check_header(header_value) + if header_value =~ /\r\n/ + raise InvalidHeader + else + header_value + end + end + + # :stopdoc: + + def error_body(backtrace, ex, host, port) @body = '' @body << <<-_end_of_html_ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> diff --git a/test/webrick/test_httpresponse.rb b/test/webrick/test_httpresponse.rb index d264637786..b8a3eb99cc 100644 --- a/test/webrick/test_httpresponse.rb +++ b/test/webrick/test_httpresponse.rb @@ -1,6 +1,7 @@ require "webrick" require "minitest/autorun" require "stringio" +require "net/http" module WEBrick class TestHTTPResponse < MiniTest::Unit::TestCase @@ -27,6 +28,27 @@ module WEBrick @res.keep_alive = true end + def test_prevent_response_splitting_headers + res['X-header'] = "malicious\r\nCookie: hack" + io = StringIO.new + res.send_response io + io.rewind + res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) + assert_equal '500', res.code + refute_match 'hack', io.string + end + + def test_prevent_response_splitting_cookie_headers + user_input = "malicious\r\nCookie: hack" + res.cookies << WEBrick::Cookie.new('author', user_input) + io = StringIO.new + res.send_response io + io.rewind + res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) + assert_equal '500', res.code + refute_match 'hack', io.string + end + def test_304_does_not_log_warning res.status = 304 res.setup_header @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.10" #define RUBY_RELEASE_DATE "2018-03-28" -#define RUBY_PATCHLEVEL 488 +#define RUBY_PATCHLEVEL 489 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 |