mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
ea9b6997cc
OpenTimeout. ReadTimeout is now raised by rbuf_fill instead of Timeout::Error to help users distinguish what type of timeout occurred. [ruby-trunk - Feature #6088] * lib/net/pop.rb (module Net): Updated documentation for ReadTimeout and OpenTimeout. * lib/net/http.rb (module Net): ditto * lib/net/smtp.rb (module Net): ditto * lib/net/telnet.rb (module Net): Net::ReadTimeout is now raised in waitfor to match Net::Protocol. * test/net/http/test_http.rb: Updated Timeout::Error expectation to Net::ReadTimeout. * test/net/ftp/test_ftp.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
618 lines
17 KiB
Ruby
618 lines
17 KiB
Ruby
# $Id$
|
|
|
|
require 'test/unit'
|
|
require 'net/http'
|
|
require 'stringio'
|
|
require_relative 'utils'
|
|
|
|
module TestNetHTTP_version_1_1_methods
|
|
|
|
def test_s_get
|
|
assert_equal $test_net_http_data,
|
|
Net::HTTP.get(config('host'), '/', config('port'))
|
|
end
|
|
|
|
def test_head
|
|
start {|http|
|
|
res = http.head('/')
|
|
assert_kind_of Net::HTTPResponse, res
|
|
assert_equal $test_net_http_data_type, res['Content-Type']
|
|
unless self.is_a?(TestNetHTTP_v1_2_chunked)
|
|
assert_equal $test_net_http_data.size, res['Content-Length'].to_i
|
|
end
|
|
}
|
|
end
|
|
|
|
def test_get
|
|
start {|http|
|
|
_test_get__get http
|
|
_test_get__iter http
|
|
_test_get__chunked http
|
|
}
|
|
end
|
|
|
|
def _test_get__get(http)
|
|
res = http.get('/')
|
|
assert_kind_of Net::HTTPResponse, res
|
|
assert_kind_of String, res.body
|
|
unless self.is_a?(TestNetHTTP_v1_2_chunked)
|
|
assert_not_nil res['content-length']
|
|
assert_equal $test_net_http_data.size, res['content-length'].to_i
|
|
end
|
|
assert_equal $test_net_http_data_type, res['Content-Type']
|
|
assert_equal $test_net_http_data.size, res.body.size
|
|
assert_equal $test_net_http_data, res.body
|
|
|
|
assert_nothing_raised {
|
|
http.get('/', { 'User-Agent' => 'test' }.freeze)
|
|
}
|
|
end
|
|
|
|
def _test_get__iter(http)
|
|
buf = ''
|
|
res = http.get('/') {|s| buf << s }
|
|
assert_kind_of Net::HTTPResponse, res
|
|
# assert_kind_of String, res.body
|
|
unless self.is_a?(TestNetHTTP_v1_2_chunked)
|
|
assert_not_nil res['content-length']
|
|
assert_equal $test_net_http_data.size, res['content-length'].to_i
|
|
end
|
|
assert_equal $test_net_http_data_type, res['Content-Type']
|
|
assert_equal $test_net_http_data.size, buf.size
|
|
assert_equal $test_net_http_data, buf
|
|
# assert_equal $test_net_http_data.size, res.body.size
|
|
# assert_equal $test_net_http_data, res.body
|
|
end
|
|
|
|
def _test_get__chunked(http)
|
|
buf = ''
|
|
res = http.get('/') {|s| buf << s }
|
|
assert_kind_of Net::HTTPResponse, res
|
|
# assert_kind_of String, res.body
|
|
unless self.is_a?(TestNetHTTP_v1_2_chunked)
|
|
assert_not_nil res['content-length']
|
|
assert_equal $test_net_http_data.size, res['content-length'].to_i
|
|
end
|
|
assert_equal $test_net_http_data_type, res['Content-Type']
|
|
assert_equal $test_net_http_data.size, buf.size
|
|
assert_equal $test_net_http_data, buf
|
|
# assert_equal $test_net_http_data.size, res.body.size
|
|
# assert_equal $test_net_http_data, res.body
|
|
end
|
|
|
|
def test_get__break
|
|
i = 0
|
|
start {|http|
|
|
http.get('/') do |str|
|
|
i += 1
|
|
break
|
|
end
|
|
}
|
|
assert_equal 1, i
|
|
end
|
|
|
|
def test_get__implicit_start
|
|
res = new().get('/')
|
|
assert_kind_of Net::HTTPResponse, res
|
|
assert_kind_of String, res.body
|
|
unless self.is_a?(TestNetHTTP_v1_2_chunked)
|
|
assert_not_nil res['content-length']
|
|
end
|
|
assert_equal $test_net_http_data_type, res['Content-Type']
|
|
assert_equal $test_net_http_data.size, res.body.size
|
|
assert_equal $test_net_http_data, res.body
|
|
end
|
|
|
|
def test_get2
|
|
start {|http|
|
|
http.get2('/') {|res|
|
|
assert_kind_of Net::HTTPResponse, res
|
|
assert_kind_of Net::HTTPResponse, res.header
|
|
unless self.is_a?(TestNetHTTP_v1_2_chunked)
|
|
assert_not_nil res['content-length']
|
|
end
|
|
assert_equal $test_net_http_data_type, res['Content-Type']
|
|
assert_kind_of String, res.body
|
|
assert_kind_of String, res.entity
|
|
assert_equal $test_net_http_data.size, res.body.size
|
|
assert_equal $test_net_http_data, res.body
|
|
assert_equal $test_net_http_data, res.entity
|
|
}
|
|
}
|
|
end
|
|
|
|
def test_post
|
|
start {|http|
|
|
_test_post__base http
|
|
_test_post__file http
|
|
}
|
|
end
|
|
|
|
def _test_post__base(http)
|
|
uheader = {}
|
|
uheader['Accept'] = 'application/octet-stream'
|
|
uheader['Content-Type'] = 'application/x-www-form-urlencoded'
|
|
data = 'post data'
|
|
res = http.post('/', data, uheader)
|
|
assert_kind_of Net::HTTPResponse, res
|
|
assert_kind_of String, res.body
|
|
assert_equal data, res.body
|
|
assert_equal data, res.entity
|
|
end
|
|
|
|
def _test_post__file(http)
|
|
data = 'post data'
|
|
f = StringIO.new
|
|
http.post('/', data, {'content-type' => 'application/x-www-form-urlencoded'}, f)
|
|
assert_equal data, f.string
|
|
end
|
|
|
|
def test_s_post_form
|
|
url = "http://#{config('host')}:#{config('port')}/"
|
|
res = Net::HTTP.post_form(
|
|
URI.parse(url),
|
|
"a" => "x")
|
|
assert_equal ["a=x"], res.body.split(/[;&]/).sort
|
|
|
|
res = Net::HTTP.post_form(
|
|
URI.parse(url),
|
|
"a" => "x",
|
|
"b" => "y")
|
|
assert_equal ["a=x", "b=y"], res.body.split(/[;&]/).sort
|
|
|
|
res = Net::HTTP.post_form(
|
|
URI.parse(url),
|
|
"a" => ["x1", "x2"],
|
|
"b" => "y")
|
|
assert_equal url, res['X-request-uri']
|
|
assert_equal ["a=x1", "a=x2", "b=y"], res.body.split(/[;&]/).sort
|
|
|
|
res = Net::HTTP.post_form(
|
|
URI.parse(url + '?a=x'),
|
|
"b" => "y")
|
|
assert_equal url + '?a=x', res['X-request-uri']
|
|
assert_equal ["b=y"], res.body.split(/[;&]/).sort
|
|
end
|
|
|
|
def test_patch
|
|
start {|http|
|
|
_test_patch__base http
|
|
}
|
|
end
|
|
|
|
def _test_patch__base(http)
|
|
uheader = {}
|
|
uheader['Accept'] = 'application/octet-stream'
|
|
uheader['Content-Type'] = 'application/x-www-form-urlencoded'
|
|
data = 'patch data'
|
|
res = http.patch('/', data, uheader)
|
|
assert_kind_of Net::HTTPResponse, res
|
|
assert_kind_of String, res.body
|
|
assert_equal data, res.body
|
|
assert_equal data, res.entity
|
|
end
|
|
|
|
def test_timeout_during_HTTP_session
|
|
bug4246 = "expected the HTTP session to have timed out but have not. c.f. [ruby-core:34203]"
|
|
|
|
# listen for connections... but deliberately do not read
|
|
TCPServer.open('localhost', 0) {|server|
|
|
port = server.addr[1]
|
|
|
|
conn = Net::HTTP.new('localhost', port)
|
|
conn.read_timeout = 0.01
|
|
conn.open_timeout = 0.01
|
|
|
|
th = Thread.new do
|
|
assert_raise(Net::ReadTimeout) {
|
|
conn.get('/')
|
|
}
|
|
end
|
|
assert th.join(10), bug4246
|
|
}
|
|
end
|
|
end
|
|
|
|
|
|
module TestNetHTTP_version_1_2_methods
|
|
|
|
def test_request
|
|
start {|http|
|
|
_test_request__GET http
|
|
_test_request__file http
|
|
# _test_request__range http # WEBrick does not support Range: header.
|
|
_test_request__HEAD http
|
|
_test_request__POST http
|
|
_test_request__stream_body http
|
|
}
|
|
end
|
|
|
|
def _test_request__GET(http)
|
|
req = Net::HTTP::Get.new('/')
|
|
http.request(req) {|res|
|
|
assert_kind_of Net::HTTPResponse, res
|
|
assert_kind_of String, res.body
|
|
unless self.is_a?(TestNetHTTP_v1_2_chunked)
|
|
assert_not_nil res['content-length']
|
|
assert_equal $test_net_http_data.size, res['content-length'].to_i
|
|
end
|
|
assert_equal $test_net_http_data.size, res.body.size
|
|
assert_equal $test_net_http_data, res.body
|
|
}
|
|
end
|
|
|
|
def _test_request__file(http)
|
|
req = Net::HTTP::Get.new('/')
|
|
http.request(req) {|res|
|
|
assert_kind_of Net::HTTPResponse, res
|
|
unless self.is_a?(TestNetHTTP_v1_2_chunked)
|
|
assert_not_nil res['content-length']
|
|
assert_equal $test_net_http_data.size, res['content-length'].to_i
|
|
end
|
|
f = StringIO.new("".force_encoding("ASCII-8BIT"))
|
|
res.read_body f
|
|
assert_equal $test_net_http_data.bytesize, f.string.bytesize
|
|
assert_equal $test_net_http_data.encoding, f.string.encoding
|
|
assert_equal $test_net_http_data, f.string
|
|
}
|
|
end
|
|
|
|
def _test_request__range(http)
|
|
req = Net::HTTP::Get.new('/')
|
|
req['range'] = 'bytes=0-5'
|
|
assert_equal $test_net_http_data[0,6], http.request(req).body
|
|
end
|
|
|
|
def _test_request__HEAD(http)
|
|
req = Net::HTTP::Head.new('/')
|
|
http.request(req) {|res|
|
|
assert_kind_of Net::HTTPResponse, res
|
|
unless self.is_a?(TestNetHTTP_v1_2_chunked)
|
|
assert_not_nil res['content-length']
|
|
assert_equal $test_net_http_data.size, res['content-length'].to_i
|
|
end
|
|
assert_nil res.body
|
|
}
|
|
end
|
|
|
|
def _test_request__POST(http)
|
|
data = 'post data'
|
|
req = Net::HTTP::Post.new('/')
|
|
req['Accept'] = $test_net_http_data_type
|
|
req['Content-Type'] = 'application/x-www-form-urlencoded'
|
|
http.request(req, data) {|res|
|
|
assert_kind_of Net::HTTPResponse, res
|
|
unless self.is_a?(TestNetHTTP_v1_2_chunked)
|
|
assert_equal data.size, res['content-length'].to_i
|
|
end
|
|
assert_kind_of String, res.body
|
|
assert_equal data, res.body
|
|
}
|
|
end
|
|
|
|
def _test_request__stream_body(http)
|
|
req = Net::HTTP::Post.new('/')
|
|
data = $test_net_http_data
|
|
req.content_length = data.size
|
|
req['Content-Type'] = 'application/x-www-form-urlencoded'
|
|
req.body_stream = StringIO.new(data)
|
|
res = http.request(req)
|
|
assert_kind_of Net::HTTPResponse, res
|
|
assert_kind_of String, res.body
|
|
assert_equal data.size, res.body.size
|
|
assert_equal data, res.body
|
|
end
|
|
|
|
def test_send_request
|
|
start {|http|
|
|
_test_send_request__GET http
|
|
_test_send_request__POST http
|
|
}
|
|
end
|
|
|
|
def _test_send_request__GET(http)
|
|
res = http.send_request('GET', '/')
|
|
assert_kind_of Net::HTTPResponse, res
|
|
unless self.is_a?(TestNetHTTP_v1_2_chunked)
|
|
assert_equal $test_net_http_data.size, res['content-length'].to_i
|
|
end
|
|
assert_kind_of String, res.body
|
|
assert_equal $test_net_http_data, res.body
|
|
end
|
|
|
|
def _test_send_request__POST(http)
|
|
data = 'aaabbb cc ddddddddddd lkjoiu4j3qlkuoa'
|
|
res = http.send_request('POST', '/', data, 'content-type' => 'application/x-www-form-urlencoded')
|
|
assert_kind_of Net::HTTPResponse, res
|
|
assert_kind_of String, res.body
|
|
assert_equal data.size, res.body.size
|
|
assert_equal data, res.body
|
|
end
|
|
|
|
def test_set_form
|
|
require 'tempfile'
|
|
file = Tempfile.new('ruby-test')
|
|
file << "\u{30c7}\u{30fc}\u{30bf}"
|
|
data = [
|
|
['name', 'Gonbei Nanashi'],
|
|
['name', "\u{540d}\u{7121}\u{3057}\u{306e}\u{6a29}\u{5175}\u{885b}"],
|
|
['s"i\o', StringIO.new("\u{3042 3044 4e9c 925b}")],
|
|
["file", file, filename: "ruby-test"]
|
|
]
|
|
expected = <<"__EOM__".gsub(/\n/, "\r\n")
|
|
--<boundary>
|
|
Content-Disposition: form-data; name="name"
|
|
|
|
Gonbei Nanashi
|
|
--<boundary>
|
|
Content-Disposition: form-data; name="name"
|
|
|
|
\xE5\x90\x8D\xE7\x84\xA1\xE3\x81\x97\xE3\x81\xAE\xE6\xA8\xA9\xE5\x85\xB5\xE8\xA1\x9B
|
|
--<boundary>
|
|
Content-Disposition: form-data; name="s\\"i\\\\o"
|
|
|
|
\xE3\x81\x82\xE3\x81\x84\xE4\xBA\x9C\xE9\x89\x9B
|
|
--<boundary>
|
|
Content-Disposition: form-data; name="file"; filename="ruby-test"
|
|
Content-Type: application/octet-stream
|
|
|
|
\xE3\x83\x87\xE3\x83\xBC\xE3\x82\xBF
|
|
--<boundary>--
|
|
__EOM__
|
|
start {|http|
|
|
_test_set_form_urlencoded(http, data.reject{|k,v|!v.is_a?(String)})
|
|
_test_set_form_multipart(http, false, data, expected)
|
|
_test_set_form_multipart(http, true, data, expected)
|
|
}
|
|
ensure
|
|
file.close! if file
|
|
end
|
|
|
|
def _test_set_form_urlencoded(http, data)
|
|
req = Net::HTTP::Post.new('/')
|
|
req.set_form(data)
|
|
res = http.request req
|
|
assert_equal "name=Gonbei+Nanashi&name=%E5%90%8D%E7%84%A1%E3%81%97%E3%81%AE%E6%A8%A9%E5%85%B5%E8%A1%9B", res.body
|
|
end
|
|
|
|
def _test_set_form_multipart(http, chunked_p, data, expected)
|
|
data.each{|k,v|v.rewind rescue nil}
|
|
req = Net::HTTP::Post.new('/')
|
|
req.set_form(data, 'multipart/form-data')
|
|
req['Transfer-Encoding'] = 'chunked' if chunked_p
|
|
res = http.request req
|
|
body = res.body
|
|
assert_match(/\A--(?<boundary>\S+)/, body)
|
|
/\A--(?<boundary>\S+)/ =~ body
|
|
expected = expected.gsub(/<boundary>/, boundary)
|
|
assert_equal(expected, body)
|
|
end
|
|
|
|
def test_set_form_with_file
|
|
require 'tempfile'
|
|
file = Tempfile.new('ruby-test')
|
|
file.binmode
|
|
file << $test_net_http_data
|
|
filename = File.basename(file.to_path)
|
|
data = [['file', file]]
|
|
expected = <<"__EOM__".gsub(/\n/, "\r\n")
|
|
--<boundary>
|
|
Content-Disposition: form-data; name="file"; filename="<filename>"
|
|
Content-Type: application/octet-stream
|
|
|
|
<data>
|
|
--<boundary>--
|
|
__EOM__
|
|
expected.sub!(/<filename>/, filename)
|
|
expected.sub!(/<data>/, $test_net_http_data)
|
|
start {|http|
|
|
data.each{|k,v|v.rewind rescue nil}
|
|
req = Net::HTTP::Post.new('/')
|
|
req.set_form(data, 'multipart/form-data')
|
|
res = http.request req
|
|
body = res.body
|
|
header, _ = body.split(/\r\n\r\n/, 2)
|
|
assert_match(/\A--(?<boundary>\S+)/, body)
|
|
/\A--(?<boundary>\S+)/ =~ body
|
|
expected = expected.gsub(/<boundary>/, boundary)
|
|
assert_match(/^--(?<boundary>\S+)\r\n/, header)
|
|
assert_match(
|
|
/^Content-Disposition: form-data; name="file"; filename="#{filename}"\r\n/,
|
|
header)
|
|
assert_equal(expected, body)
|
|
|
|
data.each{|k,v|v.rewind rescue nil}
|
|
req['Transfer-Encoding'] = 'chunked'
|
|
res = http.request req
|
|
#assert_equal(expected, res.body)
|
|
}
|
|
ensure
|
|
file.close! if file
|
|
end
|
|
end
|
|
|
|
class TestNetHTTP_v1_2 < Test::Unit::TestCase
|
|
CONFIG = {
|
|
'host' => '127.0.0.1',
|
|
'port' => 10081,
|
|
'proxy_host' => nil,
|
|
'proxy_port' => nil,
|
|
}
|
|
|
|
include TestNetHTTPUtils
|
|
include TestNetHTTP_version_1_1_methods
|
|
include TestNetHTTP_version_1_2_methods
|
|
|
|
def new
|
|
Net::HTTP.version_1_2
|
|
super
|
|
end
|
|
end
|
|
|
|
class TestNetHTTP_v1_2_chunked < Test::Unit::TestCase
|
|
CONFIG = {
|
|
'host' => '127.0.0.1',
|
|
'port' => 10081,
|
|
'proxy_host' => nil,
|
|
'proxy_port' => nil,
|
|
'chunked' => true,
|
|
}
|
|
|
|
include TestNetHTTPUtils
|
|
include TestNetHTTP_version_1_1_methods
|
|
include TestNetHTTP_version_1_2_methods
|
|
|
|
def new
|
|
Net::HTTP.version_1_2
|
|
super
|
|
end
|
|
|
|
def test_chunked_break
|
|
assert_nothing_raised("[ruby-core:29229]") {
|
|
start {|http|
|
|
http.request_get('/') {|res|
|
|
res.read_body {|chunk|
|
|
break
|
|
}
|
|
}
|
|
}
|
|
}
|
|
end
|
|
end
|
|
|
|
class TestNetHTTPContinue < Test::Unit::TestCase
|
|
CONFIG = {
|
|
'host' => '127.0.0.1',
|
|
'port' => 10081,
|
|
'proxy_host' => nil,
|
|
'proxy_port' => nil,
|
|
'chunked' => true,
|
|
}
|
|
|
|
include TestNetHTTPUtils
|
|
|
|
def logfile
|
|
@debug = StringIO.new('')
|
|
end
|
|
|
|
def mount_proc(&block)
|
|
@server.mount('/continue', WEBrick::HTTPServlet::ProcHandler.new(block.to_proc))
|
|
end
|
|
|
|
def test_expect_continue
|
|
mount_proc {|req, res|
|
|
req.continue
|
|
res.body = req.query['body']
|
|
}
|
|
start {|http|
|
|
uheader = {'content-type' => 'application/x-www-form-urlencoded', 'expect' => '100-continue'}
|
|
http.continue_timeout = 0.2
|
|
http.request_post('/continue', 'body=BODY', uheader) {|res|
|
|
assert_equal('BODY', res.read_body)
|
|
}
|
|
}
|
|
assert_match(/Expect: 100-continue/, @debug.string)
|
|
assert_match(/HTTP\/1.1 100 continue/, @debug.string)
|
|
end
|
|
|
|
def test_expect_continue_timeout
|
|
mount_proc {|req, res|
|
|
sleep 0.2
|
|
req.continue # just ignored because it's '100'
|
|
res.body = req.query['body']
|
|
}
|
|
start {|http|
|
|
uheader = {'content-type' => 'application/x-www-form-urlencoded', 'expect' => '100-continue'}
|
|
http.continue_timeout = 0
|
|
http.request_post('/continue', 'body=BODY', uheader) {|res|
|
|
assert_equal('BODY', res.read_body)
|
|
}
|
|
}
|
|
assert_match(/Expect: 100-continue/, @debug.string)
|
|
assert_match(/HTTP\/1.1 100 continue/, @debug.string)
|
|
end
|
|
|
|
def test_expect_continue_error
|
|
mount_proc {|req, res|
|
|
res.status = 501
|
|
res.body = req.query['body']
|
|
}
|
|
start {|http|
|
|
uheader = {'content-type' => 'application/x-www-form-urlencoded', 'expect' => '100-continue'}
|
|
http.continue_timeout = 0
|
|
http.request_post('/continue', 'body=ERROR', uheader) {|res|
|
|
assert_equal('ERROR', res.read_body)
|
|
}
|
|
}
|
|
assert_match(/Expect: 100-continue/, @debug.string)
|
|
assert_not_match(/HTTP\/1.1 100 continue/, @debug.string)
|
|
end
|
|
|
|
def test_expect_continue_error_while_waiting
|
|
mount_proc {|req, res|
|
|
res.status = 501
|
|
res.body = req.query['body']
|
|
}
|
|
start {|http|
|
|
uheader = {'content-type' => 'application/x-www-form-urlencoded', 'expect' => '100-continue'}
|
|
http.continue_timeout = 0.5
|
|
http.request_post('/continue', 'body=ERROR', uheader) {|res|
|
|
assert_equal('ERROR', res.read_body)
|
|
}
|
|
}
|
|
assert_match(/Expect: 100-continue/, @debug.string)
|
|
assert_not_match(/HTTP\/1.1 100 continue/, @debug.string)
|
|
end
|
|
end
|
|
|
|
class TestNetHTTPKeepAlive < Test::Unit::TestCase
|
|
CONFIG = {
|
|
'host' => '127.0.0.1',
|
|
'port' => 10081,
|
|
'proxy_host' => nil,
|
|
'proxy_port' => nil,
|
|
'RequestTimeout' => 1,
|
|
}
|
|
|
|
include TestNetHTTPUtils
|
|
|
|
def test_keep_alive_get_auto_reconnect
|
|
start {|http|
|
|
res = http.get('/')
|
|
http.keep_alive_timeout = 1
|
|
assert_kind_of Net::HTTPResponse, res
|
|
assert_kind_of String, res.body
|
|
sleep 1.5
|
|
assert_nothing_raised {
|
|
res = http.get('/')
|
|
}
|
|
assert_kind_of Net::HTTPResponse, res
|
|
assert_kind_of String, res.body
|
|
}
|
|
end
|
|
|
|
def test_keep_alive_get_auto_retry
|
|
start {|http|
|
|
res = http.get('/')
|
|
http.keep_alive_timeout = 5
|
|
assert_kind_of Net::HTTPResponse, res
|
|
assert_kind_of String, res.body
|
|
sleep 1.5
|
|
res = http.get('/')
|
|
assert_kind_of Net::HTTPResponse, res
|
|
assert_kind_of String, res.body
|
|
}
|
|
end
|
|
|
|
def test_keep_alive_server_close
|
|
def @server.run(sock)
|
|
sock.close
|
|
end
|
|
|
|
start {|http|
|
|
assert_raises(EOFError, Errno::ECONNRESET, IOError) {
|
|
res = http.get('/')
|
|
}
|
|
}
|
|
end
|
|
end
|