httpclient 2.2.0.2 → 2.2.1

data/test/test_ssl.rb

@@ -0,0 +1,215 @@
+require File.expand_path('helper', File.dirname(__FILE__))
+require 'webrick/https'
+
+
+class TestSSL < Test::Unit::TestCase
+  include Helper
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  def setup
+    super
+    @serverpid = @client = nil
+    @verify_callback_called = false
+    @verbose, $VERBOSE = $VERBOSE, nil
+    setup_server
+    setup_client
+    @url = "https://localhost:#{serverport}/hello"
+  end
+
+  def teardown
+    super
+    $VERBOSE = @verbose
+  end
+
+  def path(filename)
+    File.expand_path(filename, DIR)
+  end
+
+  def test_options
+    cfg = @client.ssl_config
+    assert_nil(cfg.client_cert)
+    assert_nil(cfg.client_key)
+    assert_nil(cfg.client_ca)
+    assert_equal(OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT, cfg.verify_mode)
+    assert_nil(cfg.verify_callback)
+    assert_nil(cfg.timeout)
+    assert_equal(OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_SSLv2, cfg.options)
+    assert_equal("ALL:!ADH:!LOW:!EXP:!MD5:+SSLv2:@STRENGTH", cfg.ciphers)
+    assert_instance_of(OpenSSL::X509::Store, cfg.cert_store)
+  end
+
+  def test_sync
+    cfg = @client.ssl_config
+    cfg.set_client_cert_file(path('client.cert'), path('client.key'))
+    cfg.add_trust_ca(path('ca.cert'))
+    cfg.add_trust_ca(path('subca.cert'))
+    assert_equal("hello", @client.get_content(@url))
+
+    @client.socket_sync = false
+    @client.reset_all
+    assert_equal("hello", @client.get_content(@url))
+  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.add_trust_ca(path('ca.cert'))
+    cfg.add_trust_ca(path('subca.cert'))
+    assert_equal("hello", @client.get_content(@url))
+    assert(str.scan(/^hello$/)[0])
+  end
+
+  def test_verification
+    cfg = @client.ssl_config
+    cfg.verify_callback = method(:verify_callback).to_proc
+    begin
+      @verify_callback_called = false
+      @client.get(@url)
+      assert(false)
+    rescue OpenSSL::SSL::SSLError => ssle
+      assert_match(/certificate verify failed/, ssle.message)
+      assert(@verify_callback_called)
+    end
+    #
+    cfg.client_cert = cert("client.cert")
+    cfg.client_key = key("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(@verify_callback_called)
+    end
+    #
+    cfg.add_trust_ca(path('ca.cert'))
+    @verify_callback_called = false
+    begin
+      @client.get(@url)
+      assert(false)
+    rescue OpenSSL::SSL::SSLError => ssle
+      assert_match(/certificate verify failed/, ssle.message)
+      assert(@verify_callback_called)
+    end
+    #
+    cfg.add_trust_ca(path('subca.cert'))
+    @verify_callback_called = false
+    assert_equal("hello", @client.get_content(@url))
+    assert(@verify_callback_called)
+    #
+    cfg.verify_depth = 1
+    @verify_callback_called = false
+    begin
+      @client.get(@url)
+      assert(false)
+    rescue OpenSSL::SSL::SSLError => ssle
+      assert_match(/certificate verify failed/, ssle.message)
+      assert(@verify_callback_called)
+    end
+    #
+    cfg.verify_depth = nil
+    cfg.cert_store = OpenSSL::X509::Store.new
+    cfg.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    begin
+      @client.get_content(@url)
+      assert(false)
+    rescue OpenSSL::SSL::SSLError => ssle
+      assert_match(/certificate verify failed/, ssle.message)
+    end
+    #
+    cfg.verify_mode = nil
+    assert_equal("hello", @client.get_content(@url))
+  end
+
+  def test_ciphers
+    cfg = @client.ssl_config
+    cfg.set_client_cert_file(path('client.cert'), path('client.key'))
+    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 = "!ALL"
+    begin
+      @client.get(@url)
+      assert(false)
+    rescue OpenSSL::SSL::SSLError => ssle
+      assert_match(/no cipher match/, ssle.message)
+    end
+    #
+    cfg.ciphers = "ALL"
+    assert_equal("hello", @client.get_content(@url))
+    #
+    cfg.ciphers = "DEFAULT"
+    assert_equal("hello", @client.get_content(@url))
+  end
+
+private
+
+  def cert(filename)
+    OpenSSL::X509::Certificate.new(File.read(File.join(DIR, filename)))
+  end
+
+  def key(filename)
+    OpenSSL::PKey::RSA.new(File.read(File.join(DIR, filename)))
+  end
+
+  def q(str)
+    %Q["#{str}"]
+  end
+
+  def setup_server
+    logger = Logger.new(STDERR)
+    logger.level = Logger::Severity::FATAL	# avoid logging SSLError (ERROR level)
+    @server = WEBrick::HTTPServer.new(
+      :BindAddress => "localhost",
+      :Logger => logger,
+      :Port => 0,
+      :AccessLog => [],
+      :DocumentRoot => DIR,
+      :SSLEnable => true,
+      :SSLCACertificateFile => File.join(DIR, 'ca.cert'),
+      :SSLCertificate => cert('server.cert'),
+      :SSLPrivateKey => key('server.key'),
+      :SSLVerifyClient => nil, #OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT|OpenSSL::SSL::VERIFY_PEER,
+      :SSLClientCA => cert('ca.cert'),
+      :SSLCertName => nil
+    )
+    @serverport = @server.config[:Port]
+    [:hello].each do |sym|
+      @server.mount(
+        "/#{sym}",
+        WEBrick::HTTPServlet::ProcHandler.new(method("do_#{sym}").to_proc)
+      )
+    end
+    @server_thread = start_server_thread(@server)
+  end
+
+  def do_hello(req, res)
+    res['content-type'] = 'text/html'
+    res.body = "hello"
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    while server.status != :Running
+      sleep 0.1
+      unless t.alive?
+	t.join
+	raise
+      end
+    end
+    t
+  end
+
+  def verify_callback(ok, cert)
+    @verify_callback_called = true
+    p ["client", ok, cert] if $DEBUG
+    ok
+  end
+end

metadata

@@ -1,79 +1,94 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: httpclient
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.2.1
   prerelease: 
-  version: 2.2.0.2
 platform: ruby
-authors: 
-- NAKAMURA, Hiroshi
+authors:
+- Hiroshi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-25 00:00:00 Z
+date: 2011-06-02 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: nahi@ruby-lang.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/oauthclient.rb
-- lib/http-access2.rbc
 - lib/http-access2.rb
-- lib/httpclient.rbc
 - lib/http-access2/cookie.rb
 - lib/http-access2/http.rb
 - lib/hexdump.rb
-- lib/httpclient/ssl_config.rbc
 - lib/httpclient/cacert_sha1.p7s
-- lib/httpclient/http.rbc
 - lib/httpclient/cookie.rb
-- lib/httpclient/session.rbc
-- lib/httpclient/auth.rbc
 - lib/httpclient/session.rb
-- lib/httpclient/cookie.rbc
 - lib/httpclient/timeout.rb
 - lib/httpclient/util.rb
 - lib/httpclient/cacert.p7s
 - lib/httpclient/ssl_config.rb
 - lib/httpclient/connection.rb
 - lib/httpclient/auth.rb
-- lib/httpclient/timeout.rbc
-- lib/httpclient/connection.rbc
-- lib/httpclient/util.rbc
 - lib/httpclient/http.rb
 - lib/httpclient.rb
+- sample/async.rb
+- sample/howto.rb
+- sample/cookie.rb
+- sample/oauth_buzz.rb
+- sample/wcat.rb
+- sample/oauth_twitter.rb
+- sample/dav.rb
+- sample/thread.rb
+- sample/stream.rb
+- sample/ssl/0key.pem
+- sample/ssl/ssl_client.rb
+- sample/ssl/htdocs/index.html
+- sample/ssl/webrick_httpsd.rb
+- sample/ssl/0cert.pem
+- sample/ssl/1000cert.pem
+- sample/ssl/1000key.pem
+- sample/oauth_friendfeed.rb
+- sample/auth.rb
+- test/test_cookie.rb
+- test/htpasswd
+- test/test_httpclient.rb
+- test/test_auth.rb
+- test/runner.rb
+- test/helper.rb
+- test/subca.cert
+- test/server.key
+- test/client.key
+- test/ca.cert
+- test/htdigest
+- test/test_http-access2.rb
+- test/server.cert
+- test/test_ssl.rb
+- test/client.cert
+- test/sslsvr.rb
 homepage: http://github.com/nahi/httpclient
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.1
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: gives something like the functionality of libwww-perl (LWP) in Ruby
 test_files: []
-

data/lib/http-access2.rbc

@@ -1,732 +0,0 @@
-!RBIX
-10485556469317998123
-x
-M
-1
-n
-n
-x
-10
-__script__
-i
-37
-5
-7
-0
-64
-47
-49
-1
-1
-15
-99
-7
-2
-65
-49
-3
-2
-13
-99
-12
-7
-4
-12
-7
-5
-12
-65
-12
-49
-6
-4
-15
-49
-4
-0
-15
-2
-11
-I
-6
-I
-0
-I
-0
-I
-0
-n
-p
-7
-s
-10
-httpclient
-x
-7
-require
-x
-11
-HTTPAccess2
-x
-11
-open_module
-x
-15
-__module_init__
-M
-1
-n
-n
-x
-11
-HTTPAccess2
-i
-274
-5
-66
-65
-7
-0
-44
-43
-1
-43
-0
-49
-2
-2
-15
-65
-7
-3
-44
-43
-1
-43
-3
-49
-2
-2
-15
-65
-7
-4
-44
-43
-1
-43
-4
-49
-2
-2
-15
-65
-7
-5
-44
-43
-1
-43
-5
-49
-2
-2
-15
-65
-7
-6
-2
-49
-2
-2
-15
-65
-7
-7
-44
-43
-1
-43
-7
-49
-2
-2
-15
-99
-7
-8
-44
-43
-1
-65
-49
-9
-3
-13
-99
-12
-7
-10
-12
-7
-11
-12
-65
-12
-49
-12
-4
-15
-49
-10
-0
-15
-65
-7
-13
-44
-43
-1
-43
-13
-49
-2
-2
-15
-65
-7
-14
-44
-43
-1
-43
-14
-49
-2
-2
-15
-65
-7
-15
-44
-43
-1
-43
-15
-49
-2
-2
-15
-65
-7
-16
-44
-43
-1
-43
-16
-49
-2
-2
-15
-65
-7
-17
-44
-43
-1
-43
-17
-49
-2
-2
-15
-65
-7
-18
-44
-43
-1
-43
-18
-49
-2
-2
-15
-65
-7
-19
-44
-43
-1
-43
-19
-49
-2
-2
-15
-65
-7
-20
-44
-43
-1
-43
-20
-49
-2
-2
-15
-65
-7
-21
-44
-43
-1
-43
-21
-49
-2
-2
-15
-65
-7
-22
-44
-43
-1
-43
-22
-49
-2
-2
-15
-65
-7
-23
-44
-43
-1
-43
-23
-49
-2
-2
-15
-65
-7
-24
-44
-43
-1
-43
-24
-49
-2
-2
-15
-99
-7
-25
-44
-43
-1
-43
-25
-65
-49
-9
-3
-13
-99
-12
-7
-10
-12
-7
-26
-12
-65
-12
-49
-12
-4
-15
-49
-10
-0
-11
-I
-6
-I
-0
-I
-0
-I
-0
-n
-p
-27
-x
-7
-VERSION
-x
-10
-HTTPClient
-x
-9
-const_set
-x
-19
-RUBY_VERSION_STRING
-x
-10
-SSLEnabled
-x
-11
-SSPIEnabled
-x
-9
-DEBUG_SSL
-x
-4
-Util
-x
-6
-Client
-x
-10
-open_class
-x
-14
-__class_init__
-M
-1
-n
-n
-x
-6
-Client
-i
-15
-5
-66
-99
-7
-0
-45
-1
-2
-65
-49
-3
-3
-15
-1
-11
-I
-4
-I
-0
-I
-0
-I
-0
-n
-p
-4
-x
-17
-RetryableResponse
-x
-13
-StandardError
-n
-x
-10
-open_class
-p
-3
-I
-2
-I
-1a
-I
-f
-x
-45
-/home/nahi/git/httpclient/lib/http-access2.rb
-p
-0
-x
-13
-attach_method
-x
-9
-SSLConfig
-x
-9
-BasicAuth
-x
-10
-DigestAuth
-x
-13
-NegotiateAuth
-x
-14
-AuthFilterBase
-x
-7
-WWWAuth
-x
-9
-ProxyAuth
-x
-4
-Site
-x
-10
-Connection
-x
-14
-SessionManager
-x
-13
-SSLSocketWrap
-x
-11
-DebugSocket
-x
-7
-Session
-M
-1
-n
-n
-x
-7
-Session
-i
-54
-5
-66
-99
-7
-0
-45
-1
-2
-65
-49
-3
-3
-15
-1
-15
-99
-7
-4
-45
-0
-5
-65
-49
-3
-3
-15
-1
-15
-99
-7
-6
-45
-0
-7
-65
-49
-3
-3
-15
-1
-15
-99
-7
-8
-45
-0
-9
-65
-49
-3
-3
-15
-1
-11
-I
-4
-I
-0
-I
-0
-I
-0
-n
-p
-10
-x
-5
-Error
-x
-13
-StandardError
-n
-x
-10
-open_class
-x
-12
-InvalidState
-n
-x
-11
-BadResponse
-n
-x
-21
-KeepAliveDisconnected
-n
-p
-9
-I
-2
-I
-2c
-I
-f
-I
-2e
-I
-1c
-I
-30
-I
-29
-I
-32
-I
-36
-x
-45
-/home/nahi/git/httpclient/lib/http-access2.rb
-p
-0
-p
-41
-I
-2
-I
-11
-I
-e
-I
-12
-I
-1a
-I
-13
-I
-26
-I
-14
-I
-32
-I
-15
-I
-3a
-I
-17
-I
-46
-I
-19
-I
-63
-I
-1e
-I
-6f
-I
-1f
-I
-7b
-I
-20
-I
-87
-I
-21
-I
-93
-I
-22
-I
-9f
-I
-23
-I
-ab
-I
-24
-I
-b7
-I
-25
-I
-c3
-I
-26
-I
-cf
-I
-27
-I
-db
-I
-28
-I
-e7
-I
-29
-I
-f3
-I
-2b
-I
-112
-x
-45
-/home/nahi/git/httpclient/lib/http-access2.rb
-p
-0
-x
-13
-attach_method
-p
-5
-I
-0
-I
-d
-I
-9
-I
-10
-I
-25
-x
-45
-/home/nahi/git/httpclient/lib/http-access2.rb
-p
-0