mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
webrick: support Proc objects as body responses * lib/webrick/httpresponse.rb (send_body): call send_body_proc (send_body_proc): new method (class ChunkedWrapper): new class * test/webrick/test_httpresponse.rb (test_send_body_proc): new test (test_send_body_proc_chunked): ditto [Feature #855] webrick: favor .write over << method This will make the next change to use IO.copy_stream easier-to-read. When we can drop Ruby 2.4 support in a few years, this will allow us to use writev(2) with multiple arguments for headers and chunked responses. * lib/webrick/cgi.rb (write): new wrapper method lib/webrick/httpresponse.rb: (send_header): use socket.write (send_body_io): ditto (send_body_string): ditto (send_body_proc): ditto (_write_data): ditto (ChunkedWrapper#write): ditto (_send_file): ditto ------------------------------------------------------------------------ r62954 | normal | 2018-03-28 17:05:52 +0900 (水, 28 3 2018) | 14 lines webrick/httpresponse: IO.copy_stream for regular files Remove the redundant _send_file method since its functionality is unnecessary with IO.copy_stream. IO.copy_stream also allows the use of sendfile under some OSes to speed up copies to non-TLS sockets. Testing with "curl >/dev/null" and "ruby -run -e httpd" to read a 1G file over Linux loopback reveals a reduction from around ~0.770 to ~0.490 seconds on the client side. * lib/webrick/httpresponse.rb (send_body_io): use IO.copy_stream (_send_file): remove [Feature #14237] ------------------------------------------------------------------------ r62955 | normal | 2018-03-28 17:05:57 +0900 (水, 28 3 2018) | 10 lines webrick: use IO.copy_stream for single range response This is also compatible with range responses generated by Rack::File (tested with rack 2.0.3). * lib/webrick/httpresponse.rb (send_body_io): use Content-Range * lib/webrick/httpservlet/filehandler.rb (make_partial_content): use File object for the single range case * test/webrick/test_filehandler.rb (get_res_body): use send_body to test result ------------------------------------------------------------------------ r62956 | normal | 2018-03-28 17:06:02 +0900 (水, 28 3 2018) | 7 lines test/webrick/test_filehandler.rb: stricter multipart range test We need to ensure we generate compatibile output in the face of future changes * test/webrick/test_filehandler.rb (test_make_partial_content): check response body ------------------------------------------------------------------------ r62957 | normal | 2018-03-28 17:06:08 +0900 (水, 28 3 2018) | 8 lines webrick: quiet warning for multi-part ranges Content-Length is ignored by WEBrick::HTTPResponse even if we calculate it, so instead we chunk responses to HTTP/1.1 clients and terminate HTTP/1.0 connections. * lib/webrick/httpservlet/filehandler.rb (make_partial_content): quiet warning ------------------------------------------------------------------------ r62958 | normal | 2018-03-28 17:06:13 +0900 (水, 28 3 2018) | 7 lines webrick/httpresponse: make ChunkedWrapper copy_stream-compatible The .write method needs to return the number of bytes written to avoid confusing IO.copy_stream. * lib/webrick/httpresponse.rb (ChunkedWrapper#write): return bytes written (ChunkedWrapper#<<): return self ------------------------------------------------------------------------ r62959 | normal | 2018-03-28 17:06:18 +0900 (水, 28 3 2018) | 9 lines webrick: use IO.copy_stream for multipart response Use the new Proc response body feature to generate a multipart range response dynamically. We use a flat array to minimize object overhead as much as possible; as many ranges may fit into an HTTP request header. * lib/webrick/httpservlet/filehandler.rb (multipart_body): new method (make_partial_content): use multipart_body get rid of test error/failure on Windows introduced at r62955 * lib/webrick/httpresponse.rb (send_body_io): use seek if NotImplementedError is raised in IO.copy_stream with offset. * lib/webrick/httpservlet/filehandler.rb (multipart_body): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@63014 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
330 lines
12 KiB
Ruby
330 lines
12 KiB
Ruby
# frozen_string_literal: false
|
|
require "test/unit"
|
|
require_relative "utils.rb"
|
|
require "webrick"
|
|
require "stringio"
|
|
|
|
class WEBrick::TestFileHandler < Test::Unit::TestCase
|
|
def default_file_handler(filename)
|
|
klass = WEBrick::HTTPServlet::DefaultFileHandler
|
|
klass.new(WEBrick::Config::HTTP, filename)
|
|
end
|
|
|
|
def windows?
|
|
File.directory?("\\")
|
|
end
|
|
|
|
def get_res_body(res)
|
|
sio = StringIO.new
|
|
sio.binmode
|
|
res.send_body(sio)
|
|
sio.string
|
|
end
|
|
|
|
def make_range_request(range_spec)
|
|
msg = <<-END_OF_REQUEST
|
|
GET / HTTP/1.0
|
|
Range: #{range_spec}
|
|
|
|
END_OF_REQUEST
|
|
return StringIO.new(msg.gsub(/^ {6}/, ""))
|
|
end
|
|
|
|
def make_range_response(file, range_spec)
|
|
req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
|
|
req.parse(make_range_request(range_spec))
|
|
res = WEBrick::HTTPResponse.new(WEBrick::Config::HTTP)
|
|
size = File.size(file)
|
|
handler = default_file_handler(file)
|
|
handler.make_partial_content(req, res, file, size)
|
|
return res
|
|
end
|
|
|
|
def test_make_partial_content
|
|
filename = __FILE__
|
|
filesize = File.size(filename)
|
|
|
|
res = make_range_response(filename, "bytes=#{filesize-100}-")
|
|
assert_match(%r{^text/plain}, res["content-type"])
|
|
assert_equal(100, get_res_body(res).size)
|
|
|
|
res = make_range_response(filename, "bytes=-100")
|
|
assert_match(%r{^text/plain}, res["content-type"])
|
|
assert_equal(100, get_res_body(res).size)
|
|
|
|
res = make_range_response(filename, "bytes=0-99")
|
|
assert_match(%r{^text/plain}, res["content-type"])
|
|
assert_equal(100, get_res_body(res).size)
|
|
|
|
res = make_range_response(filename, "bytes=100-199")
|
|
assert_match(%r{^text/plain}, res["content-type"])
|
|
assert_equal(100, get_res_body(res).size)
|
|
|
|
res = make_range_response(filename, "bytes=0-0")
|
|
assert_match(%r{^text/plain}, res["content-type"])
|
|
assert_equal(1, get_res_body(res).size)
|
|
|
|
res = make_range_response(filename, "bytes=-1")
|
|
assert_match(%r{^text/plain}, res["content-type"])
|
|
assert_equal(1, get_res_body(res).size)
|
|
|
|
res = make_range_response(filename, "bytes=0-0, -2")
|
|
assert_match(%r{^multipart/byteranges}, res["content-type"])
|
|
body = get_res_body(res)
|
|
boundary = /; boundary=(.+)/.match(res['content-type'])[1]
|
|
off = filesize - 2
|
|
last = filesize - 1
|
|
|
|
exp = "--#{boundary}\r\n" \
|
|
"Content-Type: text/plain\r\n" \
|
|
"Content-Range: bytes 0-0/#{filesize}\r\n" \
|
|
"\r\n" \
|
|
"#{IO.read(__FILE__, 1)}\r\n" \
|
|
"--#{boundary}\r\n" \
|
|
"Content-Type: text/plain\r\n" \
|
|
"Content-Range: bytes #{off}-#{last}/#{filesize}\r\n" \
|
|
"\r\n" \
|
|
"#{IO.read(__FILE__, 2, off)}\r\n" \
|
|
"--#{boundary}--\r\n"
|
|
assert_equal exp, body
|
|
end
|
|
|
|
def test_filehandler
|
|
config = { :DocumentRoot => File.dirname(__FILE__), }
|
|
this_file = File.basename(__FILE__)
|
|
filesize = File.size(__FILE__)
|
|
this_data = File.open(__FILE__, "rb") {|f| f.read}
|
|
range = nil
|
|
bug2593 = '[ruby-dev:40030]'
|
|
|
|
TestWEBrick.start_httpserver(config) do |server, addr, port, log|
|
|
http = Net::HTTP.new(addr, port)
|
|
req = Net::HTTP::Get.new("/")
|
|
http.request(req){|res|
|
|
assert_equal("200", res.code, log.call)
|
|
assert_equal("text/html", res.content_type, log.call)
|
|
assert_match(/HREF="#{this_file}"/, res.body, log.call)
|
|
}
|
|
req = Net::HTTP::Get.new("/#{this_file}")
|
|
http.request(req){|res|
|
|
assert_equal("200", res.code, log.call)
|
|
assert_equal("text/plain", res.content_type, log.call)
|
|
assert_equal(File.read(__FILE__), res.body, log.call)
|
|
}
|
|
|
|
req = Net::HTTP::Get.new("/#{this_file}", "range"=>"bytes=#{filesize-100}-")
|
|
http.request(req){|res|
|
|
assert_equal("206", res.code, log.call)
|
|
assert_equal("text/plain", res.content_type, log.call)
|
|
assert_nothing_raised(bug2593) {range = res.content_range}
|
|
assert_equal((filesize-100)..(filesize-1), range, log.call)
|
|
assert_equal(this_data[-100..-1], res.body, log.call)
|
|
}
|
|
|
|
req = Net::HTTP::Get.new("/#{this_file}", "range"=>"bytes=-100")
|
|
http.request(req){|res|
|
|
assert_equal("206", res.code, log.call)
|
|
assert_equal("text/plain", res.content_type, log.call)
|
|
assert_nothing_raised(bug2593) {range = res.content_range}
|
|
assert_equal((filesize-100)..(filesize-1), range, log.call)
|
|
assert_equal(this_data[-100..-1], res.body, log.call)
|
|
}
|
|
|
|
req = Net::HTTP::Get.new("/#{this_file}", "range"=>"bytes=0-99")
|
|
http.request(req){|res|
|
|
assert_equal("206", res.code, log.call)
|
|
assert_equal("text/plain", res.content_type, log.call)
|
|
assert_nothing_raised(bug2593) {range = res.content_range}
|
|
assert_equal(0..99, range, log.call)
|
|
assert_equal(this_data[0..99], res.body, log.call)
|
|
}
|
|
|
|
req = Net::HTTP::Get.new("/#{this_file}", "range"=>"bytes=100-199")
|
|
http.request(req){|res|
|
|
assert_equal("206", res.code, log.call)
|
|
assert_equal("text/plain", res.content_type, log.call)
|
|
assert_nothing_raised(bug2593) {range = res.content_range}
|
|
assert_equal(100..199, range, log.call)
|
|
assert_equal(this_data[100..199], res.body, log.call)
|
|
}
|
|
|
|
req = Net::HTTP::Get.new("/#{this_file}", "range"=>"bytes=0-0")
|
|
http.request(req){|res|
|
|
assert_equal("206", res.code, log.call)
|
|
assert_equal("text/plain", res.content_type, log.call)
|
|
assert_nothing_raised(bug2593) {range = res.content_range}
|
|
assert_equal(0..0, range, log.call)
|
|
assert_equal(this_data[0..0], res.body, log.call)
|
|
}
|
|
|
|
req = Net::HTTP::Get.new("/#{this_file}", "range"=>"bytes=-1")
|
|
http.request(req){|res|
|
|
assert_equal("206", res.code, log.call)
|
|
assert_equal("text/plain", res.content_type, log.call)
|
|
assert_nothing_raised(bug2593) {range = res.content_range}
|
|
assert_equal((filesize-1)..(filesize-1), range, log.call)
|
|
assert_equal(this_data[-1, 1], res.body, log.call)
|
|
}
|
|
|
|
req = Net::HTTP::Get.new("/#{this_file}", "range"=>"bytes=0-0, -2")
|
|
http.request(req){|res|
|
|
assert_equal("206", res.code, log.call)
|
|
assert_equal("multipart/byteranges", res.content_type, log.call)
|
|
}
|
|
|
|
end
|
|
end
|
|
|
|
def test_non_disclosure_name
|
|
config = { :DocumentRoot => File.dirname(__FILE__), }
|
|
log_tester = lambda {|log, access_log|
|
|
log = log.reject {|s| /ERROR `.*\' not found\./ =~ s }
|
|
log = log.reject {|s| /WARN the request refers nondisclosure name/ =~ s }
|
|
assert_equal([], log)
|
|
}
|
|
this_file = File.basename(__FILE__)
|
|
TestWEBrick.start_httpserver(config, log_tester) do |server, addr, port, log|
|
|
http = Net::HTTP.new(addr, port)
|
|
doc_root_opts = server[:DocumentRootOptions]
|
|
doc_root_opts[:NondisclosureName] = %w(.ht* *~ test_*)
|
|
req = Net::HTTP::Get.new("/")
|
|
http.request(req){|res|
|
|
assert_equal("200", res.code, log.call)
|
|
assert_equal("text/html", res.content_type, log.call)
|
|
assert_no_match(/HREF="#{File.basename(__FILE__)}"/, res.body)
|
|
}
|
|
req = Net::HTTP::Get.new("/#{this_file}")
|
|
http.request(req){|res|
|
|
assert_equal("404", res.code, log.call)
|
|
}
|
|
doc_root_opts[:NondisclosureName] = %w(.ht* *~ TEST_*)
|
|
http.request(req){|res|
|
|
assert_equal("404", res.code, log.call)
|
|
}
|
|
end
|
|
end
|
|
|
|
def test_directory_traversal
|
|
return if File.executable?(__FILE__) # skip on strange file system
|
|
|
|
config = { :DocumentRoot => File.dirname(__FILE__), }
|
|
log_tester = lambda {|log, access_log|
|
|
log = log.reject {|s| /ERROR bad URI/ =~ s }
|
|
log = log.reject {|s| /ERROR `.*\' not found\./ =~ s }
|
|
assert_equal([], log)
|
|
}
|
|
TestWEBrick.start_httpserver(config, log_tester) do |server, addr, port, log|
|
|
http = Net::HTTP.new(addr, port)
|
|
req = Net::HTTP::Get.new("/../../")
|
|
http.request(req){|res| assert_equal("400", res.code, log.call) }
|
|
req = Net::HTTP::Get.new("/..%5c../#{File.basename(__FILE__)}")
|
|
http.request(req){|res| assert_equal(windows? ? "200" : "404", res.code, log.call) }
|
|
req = Net::HTTP::Get.new("/..%5c..%5cruby.c")
|
|
http.request(req){|res| assert_equal("404", res.code, log.call) }
|
|
end
|
|
end
|
|
|
|
def test_unwise_in_path
|
|
if windows?
|
|
config = { :DocumentRoot => File.dirname(__FILE__), }
|
|
TestWEBrick.start_httpserver(config) do |server, addr, port, log|
|
|
http = Net::HTTP.new(addr, port)
|
|
req = Net::HTTP::Get.new("/..%5c..")
|
|
http.request(req){|res| assert_equal("301", res.code, log.call) }
|
|
end
|
|
end
|
|
end
|
|
|
|
def test_short_filename
|
|
return if File.executable?(__FILE__) # skip on strange file system
|
|
|
|
config = {
|
|
:CGIInterpreter => TestWEBrick::RubyBin,
|
|
:DocumentRoot => File.dirname(__FILE__),
|
|
:CGIPathEnv => ENV['PATH'],
|
|
}
|
|
log_tester = lambda {|log, access_log|
|
|
log = log.reject {|s| /ERROR `.*\' not found\./ =~ s }
|
|
log = log.reject {|s| /WARN the request refers nondisclosure name/ =~ s }
|
|
assert_equal([], log)
|
|
}
|
|
TestWEBrick.start_httpserver(config, log_tester) do |server, addr, port, log|
|
|
http = Net::HTTP.new(addr, port)
|
|
if windows?
|
|
root = config[:DocumentRoot].tr("/", "\\")
|
|
fname = IO.popen(%W[dir /x #{root}\\webrick_long_filename.cgi], &:read)
|
|
fname.sub!(/\A.*$^$.*$^$/m, '')
|
|
if fname
|
|
fname = fname[/\s(w.+?cgi)\s/i, 1]
|
|
fname.downcase!
|
|
end
|
|
else
|
|
fname = "webric~1.cgi"
|
|
end
|
|
req = Net::HTTP::Get.new("/#{fname}/test")
|
|
http.request(req) do |res|
|
|
if windows?
|
|
assert_equal("200", res.code, log.call)
|
|
assert_equal("/test", res.body, log.call)
|
|
else
|
|
assert_equal("404", res.code, log.call)
|
|
end
|
|
end
|
|
|
|
req = Net::HTTP::Get.new("/.htaccess")
|
|
http.request(req) {|res| assert_equal("404", res.code, log.call) }
|
|
req = Net::HTTP::Get.new("/htacce~1")
|
|
http.request(req) {|res| assert_equal("404", res.code, log.call) }
|
|
req = Net::HTTP::Get.new("/HTACCE~1")
|
|
http.request(req) {|res| assert_equal("404", res.code, log.call) }
|
|
end
|
|
end
|
|
|
|
def test_script_disclosure
|
|
return if File.executable?(__FILE__) # skip on strange file system
|
|
|
|
config = {
|
|
:CGIInterpreter => TestWEBrick::RubyBin,
|
|
:DocumentRoot => File.dirname(__FILE__),
|
|
:CGIPathEnv => ENV['PATH'],
|
|
:RequestCallback => Proc.new{|req, res|
|
|
def req.meta_vars
|
|
meta = super
|
|
meta["RUBYLIB"] = $:.join(File::PATH_SEPARATOR)
|
|
meta[RbConfig::CONFIG['LIBPATHENV']] = ENV[RbConfig::CONFIG['LIBPATHENV']] if RbConfig::CONFIG['LIBPATHENV']
|
|
return meta
|
|
end
|
|
},
|
|
}
|
|
log_tester = lambda {|log, access_log|
|
|
log = log.reject {|s| /ERROR `.*\' not found\./ =~ s }
|
|
assert_equal([], log)
|
|
}
|
|
TestWEBrick.start_httpserver(config, log_tester) do |server, addr, port, log|
|
|
http = Net::HTTP.new(addr, port)
|
|
|
|
req = Net::HTTP::Get.new("/webrick.cgi/test")
|
|
http.request(req) do |res|
|
|
assert_equal("200", res.code, log.call)
|
|
assert_equal("/test", res.body, log.call)
|
|
end
|
|
|
|
resok = windows?
|
|
response_assertion = Proc.new do |res|
|
|
if resok
|
|
assert_equal("200", res.code, log.call)
|
|
assert_equal("/test", res.body, log.call)
|
|
else
|
|
assert_equal("404", res.code, log.call)
|
|
end
|
|
end
|
|
req = Net::HTTP::Get.new("/webrick.cgi%20/test")
|
|
http.request(req, &response_assertion)
|
|
req = Net::HTTP::Get.new("/webrick.cgi./test")
|
|
http.request(req, &response_assertion)
|
|
resok &&= File.exist?(__FILE__+"::$DATA")
|
|
req = Net::HTTP::Get.new("/webrick.cgi::$DATA/test")
|
|
http.request(req, &response_assertion)
|
|
end
|
|
end
|
|
end
|