httpclient 2.6.0.1 → 2.7.0

data/test/test_cookie.rb

@@ -290,8 +290,8 @@ EOF
   def test_load_cookies_escaped
     uri = urify('http://example.org/')
     f = Tempfile.new('test_cookie')
-    File.open(f.path, 'w') do |f|
-      f.write <<EOF
+    File.open(f.path, 'w') do |out|
+      out.write <<EOF
 http://example.org/	key1	"value"	0	.example.org	/	13	0			
 http://example.org/	key2	""	0	.example.org	/	13	0			
 http://example.org/	key3		0	.example.org	/	13	0			

data/test/test_httpclient.rb

@@ -568,7 +568,7 @@ EOS
   end
 
   def test_get_content_with_base_url
-    @client = HTTPClient.new(:base_url => serverurl[0..-1])
+    @client = HTTPClient.new(:base_url => serverurl)
     assert_equal('hello', @client.get_content('/hello'))
     assert_equal('hello', @client.get_content('/redirect1'))
     assert_equal('hello', @client.get_content('/redirect2'))
@@ -591,8 +591,10 @@ EOS
 
   GZIP_CONTENT = "\x1f\x8b\x08\x00\x1a\x96\xe0\x4c\x00\x03\xcb\x48\xcd\xc9\xc9\x07\x00\x86\xa6\x10\x36\x05\x00\x00\x00"
   DEFLATE_CONTENT = "\x78\x9c\xcb\x48\xcd\xc9\xc9\x07\x00\x06\x2c\x02\x15"
-  GZIP_CONTENT.force_encoding('BINARY') if GZIP_CONTENT.respond_to?(:force_encoding)
-  DEFLATE_CONTENT.force_encoding('BINARY') if DEFLATE_CONTENT.respond_to?(:force_encoding)
+  DEFLATE_NOHEADER_CONTENT = "x\x9C\xCBH\xCD\xC9\xC9\a\x00\x06,\x02\x15"
+  [GZIP_CONTENT, DEFLATE_CONTENT, DEFLATE_NOHEADER_CONTENT].each do |content|
+    content.force_encoding('BINARY') if content.respond_to?(:force_encoding)
+  end
   def test_get_gzipped_content
     @client.transparent_gzip_decompression = false
     content = @client.get_content(serverurl + 'compressed?enc=gzip')
@@ -601,6 +603,7 @@ EOS
     @client.transparent_gzip_decompression = true
     assert_equal('hello', @client.get_content(serverurl + 'compressed?enc=gzip'))
     assert_equal('hello', @client.get_content(serverurl + 'compressed?enc=deflate'))
+    assert_equal('hello', @client.get_content(serverurl + 'compressed?enc=deflate_noheader'))
     @client.transparent_gzip_decompression = false
   end
 
@@ -676,14 +679,14 @@ EOS
   end
 
   def test_get_with_base_url
-    @client = HTTPClient.new(:base_url => serverurl[0..-1])
+    @client = HTTPClient.new(:base_url => serverurl)
     assert_equal("get", @client.get('/servlet').content)
     param = {'1'=>'2', '3'=>'4'}
     res = @client.get('/servlet', param)
     assert_equal(param, params(res.header["x-query"][0]))
     assert_nil(res.contenttype)
     #
-    @client.base_url = serverurl[0..-1] + '/servlet'
+    @client.base_url = serverurl[0...-1] + '/servlet'
     url = '?5=6&7=8'
     res = @client.get(url, param)
     assert_equal(param.merge("5"=>"6", "7"=>"8"), params(res.header["x-query"][0]))
@@ -691,7 +694,7 @@ EOS
   end
 
   def test_get_with_default_header
-    @client = HTTPClient.new(:base_url => serverurl[0..-1], :default_header => {'x-header' => 'custom'})
+    @client = HTTPClient.new(:base_url => serverurl, :default_header => {'x-header' => 'custom'})
     assert_equal('custom', @client.get('/servlet').headers['X-Header'])
     @client.default_header = {'x-header' => 'custom2'}
     assert_equal('custom2', @client.get('/servlet').headers['X-Header'])
@@ -767,8 +770,8 @@ EOS
 
   def test_get_with_block_arity_2
     called = false
-    res = @client.get(serverurl + 'servlet') { |res, str|
-      assert_equal(200, res.status)
+    res = @client.get(serverurl + 'servlet') { |blk_res, str|
+      assert_equal(200, blk_res.status)
       assert_equal('get', str)
       called = true
     }
@@ -780,7 +783,7 @@ EOS
   def test_get_with_block_string_recycle
     @client.read_block_size = 2
     body = []
-    res = @client.get(serverurl + 'servlet') { |str|
+    _res = @client.get(serverurl + 'servlet') { |str|
       body << str
     }
     assert_equal(2, body.size)
@@ -797,7 +800,7 @@ EOS
     url = "http://localhost:#{server.addr[1]}/"
     body = []
     begin
-      res = @client.get(url + 'chunked') { |str|
+      _res = @client.get(url + 'chunked') { |str|
         body << str
       }
     ensure
@@ -952,7 +955,7 @@ EOS
       1
     end
     @client.debug_dev = str = StringIO.new
-    res = @client.post(serverurl + 'servlet', { :file => myio })
+    _res = @client.post(serverurl + 'servlet', { :file => myio })
     assert_match(/\r\n4\r\n/, str.string, 'should send "4" not "45"')
   end
 
@@ -969,7 +972,7 @@ EOS
       end
     end
     @client.debug_dev = str = StringIO.new
-    res = @client.post(serverurl + 'servlet', { :file1 => myio1, :file2 => myio2 })
+    _res = @client.post(serverurl + 'servlet', { :file1 => myio1, :file2 => myio2 })
     assert_match(/\r\n45\r\n/, str.string)
   end
 
@@ -1032,6 +1035,36 @@ EOS
     end
   end
 
+  def test_patch
+    assert_equal("patch", @client.patch(serverurl + 'servlet', '').content)
+    param = {'1'=>'2', '3'=>'4'}
+    @client.debug_dev = str = ''
+    res = @client.patch(serverurl + 'servlet', param)
+    assert_equal(param, params(res.header["x-query"][0]))
+    assert_equal('Content-Type: application/x-www-form-urlencoded', str.split(/\r?\n/)[5])
+  end
+
+  def test_patch_with_query_and_body
+    res = @client.patch(serverurl + 'servlet', :query => {:query => 'query'}, :body => {:body => 'body'})
+    assert_equal("patch", res.content)
+    assert_equal("body=body", res.headers["X-Query"])
+    assert_equal("query=query", res.headers["X-Request-Query"])
+  end
+
+  def test_patch_bytesize
+    res = @client.patch(serverurl + 'servlet', 'txt' => 'あいうえお')
+    assert_equal('txt=%E3%81%82%E3%81%84%E3%81%86%E3%81%88%E3%81%8A', res.header["x-query"][0])
+    assert_equal('15', res.header["x-size"][0])
+  end
+
+  def test_patch_async
+    param = {'1'=>'2', '3'=>'4'}
+    conn = @client.patch_async(serverurl + 'servlet', param)
+    Thread.pass while !conn.finished?
+    res = conn.pop
+    assert_equal(param, params(res.header["x-query"][0]))
+  end
+
   def test_put
     assert_equal("put", @client.put(serverurl + 'servlet', '').content)
     param = {'1'=>'2', '3'=>'4'}
@@ -1240,7 +1273,7 @@ EOS
 
   def test_http_custom_date_header
     @client.debug_dev = (str = "")
-    res = @client.get(serverurl + 'hello', :header => {'Date' => 'foo'})
+    _res = @client.get(serverurl + 'hello', :header => {'Date' => 'foo'})
     lines = str.split(/(?:\r?\n)+/)
     assert_equal('Date: foo', lines[4])
   end
@@ -1840,14 +1873,6 @@ private
     @server_thread = start_server_thread(@server)
   end
 
-  def escape_noproxy
-    backup = HTTPClient::NO_PROXY_HOSTS.dup
-    HTTPClient::NO_PROXY_HOSTS.clear
-    yield
-  ensure
-    HTTPClient::NO_PROXY_HOSTS.replace(backup)
-  end
-
   def add_query_string(req)
     if req.query_string
       '?' + req.query_string
@@ -1922,6 +1947,9 @@ private
     elsif req.query['enc'] == 'deflate'
       res['content-encoding'] = 'deflate'
       res.body = DEFLATE_CONTENT
+    elsif req.query['enc'] == 'deflate_noheader'
+      res['content-encoding'] = 'deflate'
+      res.body = DEFLATE_NOHEADER_CONTENT
     end
   end
 
@@ -1966,6 +1994,14 @@ private
       res["x-request-query"] = req.query_string
     end
 
+    def do_PATCH(req, res)
+      res["x-query"] = body_response(req)
+      param = WEBrick::HTTPUtils.parse_query(req.body) || {}
+      res["x-size"] = (param['txt'] || '').size
+      res.body = param['txt'] || 'patch'
+      res["x-request-query"] = req.query_string
+    end
+
     def do_PUT(req, res)
       res["x-query"] = body_response(req)
       param = WEBrick::HTTPUtils.parse_query(req.body) || {}

data/test/test_ssl.rb

@@ -4,6 +4,7 @@ require 'webrick/https'
 
 class TestSSL < Test::Unit::TestCase
   include Helper
+
   DIR = File.dirname(File.expand_path(__FILE__))
 
   def setup
@@ -25,6 +26,20 @@ class TestSSL < Test::Unit::TestCase
     File.expand_path(filename, DIR)
   end
 
+  def test_proxy_ssl
+    setup_proxyserver
+    escape_noproxy do
+      @client.proxy = proxyurl
+      @client.ssl_config.set_client_cert_file(path('client.cert'), path('client.key'))
+      @client.ssl_config.add_trust_ca(path('ca.cert'))
+      @client.ssl_config.add_trust_ca(path('subca.cert'))
+      @client.debug_dev = str = ""
+      assert_equal(200, @client.get(@url).status)
+      assert(/accept/ =~ @proxyio.string, 'proxy is not used')
+      assert(/Host: localhost:#{serverport}/ =~ str)
+    end
+  end
+
   def test_options
     cfg = @client.ssl_config
     assert_nil(cfg.client_cert)
@@ -41,6 +56,8 @@ class TestSSL < Test::Unit::TestCase
     assert_instance_of(OpenSSL::X509::Store, cfg.cert_store)
   end
 
+unless defined?(HTTPClient::JRubySSLSocket)
+  # JRubySSLSocket does not support sync mode.
   def test_sync
     cfg = @client.ssl_config
     cfg.set_client_cert_file(path('client.cert'), path('client.key'))
@@ -52,12 +69,13 @@ class TestSSL < Test::Unit::TestCase
     @client.reset_all
     assert_equal("hello", @client.get_content(@url))
   end
+end
 
   def test_debug_dev
     str = @client.debug_dev = ''
     cfg = @client.ssl_config
-    cfg.client_cert = cert("client.cert")
-    cfg.client_key = key("client.key")
+    cfg.client_cert = path("client.cert")
+    cfg.client_key = path("client.key")
     cfg.add_trust_ca(path('ca.cert'))
     cfg.add_trust_ca(path('subca.cert'))
     assert_equal("hello", @client.get_content(@url))
@@ -72,18 +90,18 @@ class TestSSL < Test::Unit::TestCase
       @client.get(@url)
       assert(false)
     rescue OpenSSL::SSL::SSLError => ssle
-      assert_match(/certificate verify failed/, ssle.message)
+      assert_match(/(certificate verify failed|unable to find valid certification path to requested target)/, ssle.message)
       assert(@verify_callback_called)
     end
     #
-    cfg.client_cert = cert("client.cert")
-    cfg.client_key = key("client.key")
+    cfg.client_cert = path("client.cert")
+    cfg.client_key = path("client.key")
     @verify_callback_called = false
     begin
       @client.get(@url)
       assert(false)
     rescue OpenSSL::SSL::SSLError => ssle
-      assert_match(/certificate verify failed/, ssle.message)
+      assert_match(/(certificate verify failed|unable to find valid certification path to requested target)/, ssle.message)
       assert(@verify_callback_called)
     end
     #
@@ -93,7 +111,7 @@ class TestSSL < Test::Unit::TestCase
       @client.get(@url)
       assert(false)
     rescue OpenSSL::SSL::SSLError => ssle
-      assert_match(/certificate verify failed/, ssle.message)
+      assert_match(/(certificate verify failed|unable to find valid certification path to requested target)/, ssle.message)
       assert(@verify_callback_called)
     end
     #
@@ -102,16 +120,16 @@ class TestSSL < Test::Unit::TestCase
     assert_equal("hello", @client.get_content(@url))
     assert(@verify_callback_called)
     #
-unless ENV['TRAVIS']
-# On travis environment, verify_depth seems to not work properly.
-# Ubuntu 10.04 + OpenSSL 0.9.8k issue?
+if false
+  # JRubySSLSocket does not support depth.
+  # Also on travis environment, verify_depth seems to not work properly.
     cfg.verify_depth = 1 # 2 required: root-sub
     @verify_callback_called = false
     begin
       @client.get(@url)
       assert(false, "verify_depth is not supported? #{OpenSSL::OPENSSL_VERSION}")
     rescue OpenSSL::SSL::SSLError => ssle
-      assert_match(/certificate verify failed/, ssle.message)
+      assert_match(/(certificate verify failed|unable to find valid certification path to requested target)/, ssle.message)
       assert(@verify_callback_called)
     end
     #
@@ -128,13 +146,39 @@ end
       @client.get_content(@url)
       assert(false)
     rescue OpenSSL::SSL::SSLError => ssle
-      assert_match(/certificate verify failed/, ssle.message)
+      assert_match(/(certificate verify failed|unable to find valid certification path to requested target)/, ssle.message)
     end
     #
     cfg.verify_mode = nil
     assert_equal("hello", @client.get_content(@url))
   end
 
+if defined?(HTTPClient::JRubySSLSocket)
+  def test_ciphers
+    cfg = @client.ssl_config
+    cfg.set_client_cert_file(path('client.cert'), path('client-pass.key'), 'pass4key')
+    cfg.add_trust_ca(path('ca.cert'))
+    cfg.add_trust_ca(path('subca.cert'))
+    cfg.timeout = 123
+    assert_equal("hello", @client.get_content(@url))
+    #
+    cfg.ciphers = []
+    begin
+      @client.get(@url)
+      assert(false)
+    rescue OpenSSL::SSL::SSLError => ssle
+      assert_match(/No appropriate protocol/, ssle.message)
+    end
+    #
+    cfg.ciphers = %w(TLS_RSA_WITH_AES_128_CBC_SHA)
+    assert_equal("hello", @client.get_content(@url))
+    #
+    cfg.ciphers = HTTPClient::SSLConfig::CIPHERS_DEFAULT
+    assert_equal("hello", @client.get_content(@url))
+  end
+
+else
+
   def test_ciphers
     cfg = @client.ssl_config
     cfg.set_client_cert_file(path('client.cert'), path('client-pass.key'), 'pass4key')
@@ -157,15 +201,20 @@ end
     cfg.ciphers = "DEFAULT"
     assert_equal("hello", @client.get_content(@url))
   end
+end
 
-  def test_set_default_paths
-    assert_raise(OpenSSL::SSL::SSLError) do
-      @client.get(@url)
-    end
-    escape_env do
-      ENV['SSL_CERT_FILE'] = File.join(DIR, 'ca-chain.cert')
-      @client.ssl_config.set_default_paths
-      @client.get(@url)
+  # SSL_CERT_FILE does not work with recent jruby-openssl.
+  # You should not depend on SSL_CERT_FILE on JRuby
+  if !defined?(JRUBY_VERSION)
+    def test_set_default_paths
+      assert_raise(OpenSSL::SSL::SSLError) do
+        @client.get(@url)
+      end
+      escape_env do
+        ENV['SSL_CERT_FILE'] = File.join(DIR, 'ca-chain.pem')
+        @client.ssl_config.set_default_paths
+        @client.get(@url)
+      end
     end
   end
 
@@ -180,7 +229,7 @@ end
 
   def test_allow_tlsv1
     teardown_server
-    setup_server#_with_ssl_version(:TLSv1)
+    setup_server_with_ssl_version(:TLSv1)
     assert_nothing_raised do
       @client.ssl_config.verify_mode = nil
       @client.get("https://localhost:#{serverport}/hello")

data/test/test_webagent-cookie.rb

@@ -440,8 +440,8 @@ EOF
   def test_load_cookies_escaped
     uri = urify('http://example.org/')
     f = Tempfile.new('test_cookie')
-    File.open(f.path, 'w') do |f|
-      f.write <<EOF
+    File.open(f.path, 'w') do |out|
+      out.write <<EOF
 http://example.org/	key	"value"	0	.example.org	/	13	0			
 http://example.org/	key	""		.example.org	/	13	0			
 http://example.org/	key			.example.org	/	13	0			

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpclient
 version: !ruby/object:Gem::Version
-  version: 2.6.0.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Hiroshi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-03 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nahi@ruby-lang.org
@@ -17,25 +17,29 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - bin/httpclient
 - bin/jsonclient
 - lib/hexdump.rb
+- lib/http-access2.rb
 - lib/http-access2/cookie.rb
 - lib/http-access2/http.rb
-- lib/http-access2.rb
+- lib/httpclient.rb
 - lib/httpclient/auth.rb
-- lib/httpclient/cacert.p7s
+- lib/httpclient/cacert.pem
+- lib/httpclient/cacert1024.pem
 - lib/httpclient/connection.rb
 - lib/httpclient/cookie.rb
 - lib/httpclient/http.rb
 - lib/httpclient/include_client.rb
+- lib/httpclient/jruby_ssl_socket.rb
 - lib/httpclient/session.rb
 - lib/httpclient/ssl_config.rb
+- lib/httpclient/ssl_socket.rb
 - lib/httpclient/timeout.rb
 - lib/httpclient/util.rb
 - lib/httpclient/version.rb
 - lib/httpclient/webagent-cookie.rb
-- lib/httpclient.rb
 - lib/jsonclient.rb
 - lib/oauthclient.rb
 - sample/async.rb
@@ -57,7 +61,7 @@ files:
 - sample/stream.rb
 - sample/thread.rb
 - sample/wcat.rb
-- test/ca-chain.cert
+- test/ca-chain.pem
 - test/ca.cert
 - test/client-pass.key
 - test/client.cert
@@ -79,7 +83,6 @@ files:
 - test/test_jsonclient.rb
 - test/test_ssl.rb
 - test/test_webagent-cookie.rb
-- README.md
 homepage: https://github.com/nahi/httpclient
 licenses:
 - ruby
@@ -90,17 +93,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: gives something like the functionality of libwww-perl (LWP) in Ruby