httpclient 2.2.0.2 → 2.2.1

data/test/client.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQDRWssrK8Gyr+500hpLjCGR3+AHL8/hEJM5zKi/MgLWjTkvsgOw
+bYwXOiNtAbR9y4/ucDq7EY+cMUMHES4uFaPTcOaAV0aZRmk8AgslN1tQgNS6ew7/
+Luq3DcVeWkX8PYgR9VG0mD1MPfJ6+IFA5d3vKpdBkBgN4l46jjO0/2XfewIDAQAB
+AoGAZcz8llWErtsV3QB9gNb3S/PNADGjqBFjReva8n3jG2k4sZSibpwWTwUaTNtT
+ZQgjSRKRvH1hk9XwffNAvXAQZNNkuj/16gO2oO45nyLj4dO365ujLptWnVIWDHOE
+uN0GeiZO+VzcCisT0WCq4tvtLeH8svrxzA8cbXIEyOK7NiECQQDwo2zPFyKAZ/Cu
+lDJ6zKT+RjfWwW7DgWzirAlTrt4ViMaW+IaDH29TmQpb4V4NuR3Xi+2Xl4oicu6S
+36TW9+/FAkEA3rgfOQJuLlWSnw1RTGwvnC816a/W7iYYY7B+0U4cDbfWl7IoXT4y
+M8nV/HESooviZLqBwzAYSoj3fFKYBKpGPwJAUO8GN5iWWA2dW3ooiDiv/X1sZmRk
+dojfMFWgRW747tEzya8Ivq0h6kH8w+5GjeMG8Gn1nRiwsulo6Ckj7dEx6QJACyui
+7UIQ8qP6GZ4aYMHgVW4Mvy7Bkeo5OO7GPYs0Xv/EdJFL8vlGnVBXOjUVoS9w6Gpu
+TbLg1QQvnX2rADjmEwJANxZO2GUkaWGsEif8aGW0x5g/IdaMGG27pTWk5zqix7P3
+1UDrdo/JOXhptovhRi06EppIxAxYmbh9vd9VN8Itlw==
+-----END RSA PRIVATE KEY-----

data/test/helper.rb

@@ -0,0 +1,99 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require 'httpclient'
+require 'webrick'
+require 'webrick/httpproxy.rb'
+require 'logger'
+require 'stringio'
+require 'cgi'
+require 'webrick/httputils'
+
+
+module Helper
+  Port = 17171
+  ProxyPort = 17172
+
+  def serverport
+    @serverport
+  end
+
+  def proxyport
+    @proxyport
+  end
+
+  def serverurl
+    "http://localhost:#{serverport}/"
+  end
+
+  def proxyurl
+    "http://localhost:#{proxyport}/"
+  end
+
+  def setup
+    @logger = Logger.new(STDERR)
+    @logger.level = Logger::Severity::FATAL
+    @proxyio = StringIO.new
+    @proxylogger = Logger.new(@proxyio)
+    @proxylogger.level = Logger::Severity::DEBUG
+    @server = @proxyserver = @client = nil
+    @server_thread = @proxyserver_thread = nil
+    @serverport = Port
+    @proxyport = ProxyPort
+  end
+
+  def teardown
+    teardown_client if @client
+    teardown_proxyserver if @proxyserver
+    teardown_server if @server
+  end
+
+  def setup_client
+    @client = HTTPClient.new
+  end
+
+  #def setup_server
+    # override it
+    # @server = WEBrick::HTTPServer.new(...)
+    # @server_thread = start_server_thread(@server)
+  #end
+
+  def setup_proxyserver
+    @proxyserver = WEBrick::HTTPProxyServer.new(
+      :BindAddress => "localhost",
+      :Logger => @proxylogger,
+      :Port => 0,
+      :AccessLog => []
+    )
+    @proxyport = @proxyserver.config[:Port]
+    @proxyserver_thread = start_server_thread(@proxyserver)
+  end
+
+  def teardown_client
+    @client.reset_all
+  end
+
+  def teardown_server
+    @server.shutdown
+    #@server_thread.kill
+  end
+
+  def teardown_proxyserver
+    @proxyserver.shutdown
+    #@proxyserver_thread.kill
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    while server.status != :Running
+      Thread.pass
+      unless t.alive?
+	t.join
+	raise
+      end
+    end
+    t
+  end
+end

data/test/htdigest

@@ -0,0 +1 @@
+admin:auth:4302fe65caa32f27721949149ccd3083

data/test/htpasswd

@@ -0,0 +1,2 @@
+admin:Qg266hq/YYKe2
+guest:gbPc4vPCH.h12

data/test/runner.rb

@@ -0,0 +1,2 @@
+require 'test/unit'
+exit Test::Unit::AutoRunner.run(true, File.dirname($0))

data/test/server.cert

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIC/zCCAeegAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGDAJKUDES
+MBAGA1UECgwJSklOLkdSLkpQMQwwCgYDVQQLDANSUlIxDjAMBgNVBAMMBVN1YkNB
+MB4XDTA0MDEzMTAzMTMxNloXDTMzMDEyMzAzMTMxNlowQzELMAkGA1UEBgwCSlAx
+EjAQBgNVBAoMCUpJTi5HUi5KUDEMMAoGA1UECwwDUlJSMRIwEAYDVQQDDAlsb2Nh
+bGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFJTxWqup3nV9dsJAku
+p+WaXnPNIzcpAA3qMGZDJTJsfa8Du7ZxTP0XJK5mETttBrn711cJxAuP3KjqnW9S
+vtZ9lY2sXJ6Zj62sN5LwG3VVe25dI28yR1EsbHjJ5Zjf9tmggMC6am52dxuHbt5/
+vHo4ngJuKE/U+eeGRivMn6gFAgMBAAGjgYUwgYIwDAYDVR0TAQH/BAIwADAxBglg
+hkgBhvhCAQ0EJBYiUnVieS9PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
+BgNVHQ4EFgQUpZIyygD9JxFYHHOTEuWOLbCKfckwCwYDVR0PBAQDAgWgMBMGA1Ud
+JQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4IBAQBwAIj5SaBHaA5X31IP
+CFCJiep96awfp7RANO0cuUj+ZpGoFn9d6FXY0g+Eg5wAkCNIzZU5NHN9xsdOpnUo
+zIBbyTfQEPrge1CMWMvL6uGaoEXytq84VTitF/xBTky4KtTn6+es4/e7jrrzeUXQ
+RC46gkHObmDT91RkOEGjHLyld2328jo3DIN/VTHIryDeVHDWjY5dENwpwdkhhm60
+DR9IrNBbXWEe9emtguNXeN0iu1ux0lG1Hc6pWGQxMlRKNvGh0yZB9u5EVe38tOV0
+jQaoNyL7qzcQoXD3Dmbi1p0iRmg/+HngISsz8K7k7MBNVsSclztwgCzTZOBiVtkM
+rRlQ
+-----END CERTIFICATE-----

data/test/server.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDRSU8Vqrqd51fXbCQJLqflml5zzSM3KQAN6jBmQyUybH2vA7u2
+cUz9FySuZhE7bQa5+9dXCcQLj9yo6p1vUr7WfZWNrFyemY+trDeS8Bt1VXtuXSNv
+MkdRLGx4yeWY3/bZoIDAumpudncbh27ef7x6OJ4CbihP1PnnhkYrzJ+oBQIDAQAB
+AoGBAIf4CstW2ltQO7+XYGoex7Hh8s9lTSW/G2vu5Hbr1LTHy3fzAvdq8MvVR12O
+rk9fa+lU9vhzPc0NMB0GIDZ9GcHuhW5hD1Wg9OSCbTOkZDoH3CAFqonjh4Qfwv5W
+IPAFn9KHukdqGXkwEMdErsUaPTy9A1V/aROVEaAY+HJgq/eZAkEA/BP1QMV04WEZ
+Oynzz7/lLizJGGxp2AOvEVtqMoycA/Qk+zdKP8ufE0wbmCE3Qd6GoynavsHb6aGK
+gQobb8zDZwJBANSK6MrXlrZTtEaeZuyOB4mAmRzGzOUVkUyULUjEx2GDT93ujAma
+qm/2d3E+wXAkNSeRpjUmlQXy/2oSqnGvYbMCQQDRM+cYyEcGPUVpWpnj0shrF/QU
+9vSot/X1G775EMTyaw6+BtbyNxVgOIu2J+rqGbn3c+b85XqTXOPL0A2RLYkFAkAm
+syhSDtE9X55aoWsCNZY/vi+i4rvaFoQ/WleogVQAeGVpdo7/DK9t9YWoFBIqth0L
+mGSYFu9ZhvZkvQNV8eYrAkBJ+rOIaLDsmbrgkeDruH+B/9yrm4McDtQ/rgnOGYnH
+LjLpLLOrgUxqpzLWe++EwSLwK2//dHO+SPsQJ4xsyQJy
+-----END RSA PRIVATE KEY-----

data/test/sslsvr.rb

@@ -0,0 +1,65 @@
+require 'webrick/https'
+require 'logger'
+require 'rbconfig'
+
+PORT = 17171
+DIR = File.dirname(File.expand_path(__FILE__))
+
+def cert(filename)
+  OpenSSL::X509::Certificate.new(File.open(File.join(DIR, filename)) { |f|
+    f.read
+  })
+end
+
+def key(filename)
+  OpenSSL::PKey::RSA.new(File.open(File.join(DIR, filename)) { |f|
+    f.read
+  })
+end
+
+def do_hello(req, res)
+  res['content-type'] = 'text/html'
+  res.body = "hello"
+end
+
+logger = Logger.new(STDERR)
+logger.level = Logger::Severity::FATAL	# avoid logging SSLError (ERROR level)
+
+server = WEBrick::HTTPServer.new(
+  :BindAddress => "localhost",
+  :Logger => logger,
+  :Port => PORT,
+  :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
+)
+trap(:INT) do
+  server.shutdown
+end
+[:hello].each do |sym|
+  server.mount(
+    "/#{sym}",
+    WEBrick::HTTPServlet::ProcHandler.new(method("do_#{sym}").to_proc)
+  )
+end
+
+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
+STDOUT.sync = true
+puts $$
+t.join

data/test/subca.cert

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA8MQswCQYDVQQGDAJKUDES
+MBAGA1UECgwJSklOLkdSLkpQMQwwCgYDVQQLDANSUlIxCzAJBgNVBAMMAkNBMB4X
+DTA0MDEzMDAwNDMyN1oXDTM1MDEyMjAwNDMyN1owPzELMAkGA1UEBgwCSlAxEjAQ
+BgNVBAoMCUpJTi5HUi5KUDEMMAoGA1UECwwDUlJSMQ4wDAYDVQQDDAVTdWJDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ0Ou7AyRcRXnB/kVHv/6kwe
+ANzgg/DyJfsAUqW90m7Lu1nqyug8gK0RBd77yU0w5HOAMHTVSdpjZK0g2sgx4Mb1
+d/213eL9TTl5MRVEChTvQr8q5DVG/8fxPPE7fMI8eOAzd98/NOAChk+80r4Sx7fC
+kGVEE1bKwY1MrUsUNjOY2d6t3M4HHV3HX1V8ShuKfsHxgCmLzdI8U+5CnQedFgkm
+3e+8tr8IX5RR1wA1Ifw9VadF7OdI/bGMzog/Q8XCLf+WPFjnK7Gcx6JFtzF6Gi4x
+4dp1Xl45JYiVvi9zQ132wu8A1pDHhiNgQviyzbP+UjcB/tsOpzBQF8abYzgEkWEC
+AwEAAaNyMHAwDwYDVR0TAQH/BAUwAwEB/zAxBglghkgBhvhCAQ0EJBYiUnVieS9P
+cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUlCjXWLsReYzH
+LzsxwVnCXmKoB/owCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQCJ/OyN
+rT8Cq2Y+G2yA/L1EMRvvxwFBqxavqaqHl/6rwsIBFlB3zbqGA/0oec6MAVnYynq4
+c4AcHTjx3bQ/S4r2sNTZq0DH4SYbQzIobx/YW8PjQUJt8KQdKMcwwi7arHP7A/Ha
+LKu8eIC2nsUBnP4NhkYSGhbmpJK+PFD0FVtD0ZIRlY/wsnaZNjWWcnWF1/FNuQ4H
+ySjIblqVQkPuzebv3Ror6ZnVDukn96Mg7kP4u6zgxOeqlJGRe1M949SS9Vudjl8X
+SF4aZUUB9pQGhsqQJVqaz2OlhGOp9D0q54xko/rekjAIcuDjl1mdX4F2WRrzpUmZ
+uY/bPeOBYiVsOYVe
+-----END CERTIFICATE-----

data/test/test_auth.rb

@@ -0,0 +1,196 @@
+require File.expand_path('helper', File.dirname(__FILE__))
+
+
+class TestAuth < Test::Unit::TestCase
+  include Helper
+
+  def setup
+    super
+    setup_server
+  end
+
+  def teardown
+    super
+  end
+
+  def setup_server
+    @server = WEBrick::HTTPServer.new(
+      :BindAddress => "localhost",
+      :Logger => @logger,
+      :Port => 0,
+      :AccessLog => [],
+      :DocumentRoot => File.dirname(File.expand_path(__FILE__))
+    )
+    @serverport = @server.config[:Port]
+    @server.mount(
+      '/basic_auth',
+      WEBrick::HTTPServlet::ProcHandler.new(method(:do_basic_auth).to_proc)
+    )
+    @server.mount(
+      '/digest_auth',
+      WEBrick::HTTPServlet::ProcHandler.new(method(:do_digest_auth).to_proc)
+    )
+    @server.mount(
+      '/digest_sess_auth',
+      WEBrick::HTTPServlet::ProcHandler.new(method(:do_digest_sess_auth).to_proc)
+    )
+    htpasswd = File.join(File.dirname(__FILE__), 'htpasswd')
+    htpasswd_userdb = WEBrick::HTTPAuth::Htpasswd.new(htpasswd)
+    htdigest = File.join(File.dirname(__FILE__), 'htdigest')
+    htdigest_userdb = WEBrick::HTTPAuth::Htdigest.new(htdigest)
+    @basic_auth = WEBrick::HTTPAuth::BasicAuth.new(
+      :Realm => 'auth',
+      :UserDB => htpasswd_userdb
+    )
+    @digest_auth = WEBrick::HTTPAuth::DigestAuth.new(
+      :Algorithm => 'MD5',
+      :Realm => 'auth',
+      :UserDB => htdigest_userdb
+    )
+    @digest_sess_auth = WEBrick::HTTPAuth::DigestAuth.new(
+      :Algorithm => 'MD5-sess',
+      :Realm => 'auth',
+      :UserDB => htdigest_userdb
+    )
+    @server_thread = start_server_thread(@server)
+  end
+
+  def do_basic_auth(req, res)
+    @basic_auth.authenticate(req, res)
+    res['content-type'] = 'text/plain'
+    res.body = 'basic_auth OK'
+  end
+
+  def do_digest_auth(req, res)
+    @digest_auth.authenticate(req, res)
+    res['content-type'] = 'text/plain'
+    res['x-query'] = req.body
+    res.body = 'digest_auth OK' + req.query_string.to_s
+  end
+
+  def do_digest_sess_auth(req, res)
+    @digest_sess_auth.authenticate(req, res)
+    res['content-type'] = 'text/plain'
+    res['x-query'] = req.body
+    res.body = 'digest_sess_auth OK' + req.query_string.to_s
+  end
+
+  def test_basic_auth
+    c = HTTPClient.new
+    c.set_auth("http://localhost:#{serverport}/", 'admin', 'admin')
+    assert_equal('basic_auth OK', c.get_content("http://localhost:#{serverport}/basic_auth"))
+  end
+
+  def test_basic_auth_compat
+    c = HTTPClient.new
+    c.set_basic_auth("http://localhost:#{serverport}/", 'admin', 'admin')
+    assert_equal('basic_auth OK', c.get_content("http://localhost:#{serverport}/basic_auth"))
+  end
+
+  def test_BASIC_auth
+    c = HTTPClient.new
+    webrick_backup = @basic_auth.instance_eval { @auth_scheme }
+    #httpaccess2_backup = c.www_auth.basic_auth.instance_eval { @scheme }
+    begin
+      @basic_auth.instance_eval { @auth_scheme = "BASIC" }
+      c.www_auth.basic_auth.instance_eval { @scheme = "BASIC" }
+      c.set_auth("http://localhost:#{serverport}/", 'admin', 'admin')
+      assert_equal('basic_auth OK', c.get_content("http://localhost:#{serverport}/basic_auth"))
+    ensure
+      @basic_auth.instance_eval { @auth_scheme = webrick_backup }
+      #c.www_auth.basic_auth.instance_eval { @scheme = httpaccess2_backup }
+    end
+  end
+
+  def test_digest_auth
+    c = HTTPClient.new
+    c.set_auth("http://localhost:#{serverport}/", 'admin', 'admin')
+    assert_equal('digest_auth OK', c.get_content("http://localhost:#{serverport}/digest_auth"))
+  end
+
+  def test_digest_auth_with_block
+    c = HTTPClient.new
+    c.set_auth("http://localhost:#{serverport}/", 'admin', 'admin')
+    called = false
+    c.get_content("http://localhost:#{serverport}/digest_auth") do |str|
+      assert_equal('digest_auth OK', str)
+      called = true
+    end
+    assert(called)
+    #
+    called = false
+    c.get("http://localhost:#{serverport}/digest_auth") do |str|
+      assert_equal('digest_auth OK', str)
+      called = true
+    end
+    assert(called)
+  end
+
+  def test_digest_auth_with_post_io
+    c = HTTPClient.new
+    c.set_auth("http://localhost:#{serverport}/", 'admin', 'admin')
+    post_body = StringIO.new("1234567890")
+    assert_equal('1234567890', c.post("http://localhost:#{serverport}/digest_auth", post_body).header['x-query'][0])
+    #
+    post_body = StringIO.new("1234567890")
+    post_body.read(5)
+    assert_equal('67890', c.post("http://localhost:#{serverport}/digest_auth", post_body).header['x-query'][0])
+  end
+
+  def test_digest_auth_with_querystring
+    c = HTTPClient.new
+    c.debug_dev = STDERR if $DEBUG
+    c.set_auth("http://localhost:#{serverport}/", 'admin', 'admin')
+    assert_equal('digest_auth OKbar=baz', c.get_content("http://localhost:#{serverport}/digest_auth/foo?bar=baz"))
+  end
+
+  def test_digest_sess_auth
+    c = HTTPClient.new
+    c.set_auth("http://localhost:#{serverport}/", 'admin', 'admin')
+    assert_equal('digest_sess_auth OK', c.get_content("http://localhost:#{serverport}/digest_sess_auth"))
+  end
+
+  def test_proxy_auth
+    c = HTTPClient.new
+    c.set_proxy_auth('admin', 'admin')
+    c.test_loopback_http_response << "HTTP/1.0 407 Unauthorized\nProxy-Authenticate: Basic realm=\"foo\"\nContent-Length: 2\n\nNG"
+    c.test_loopback_http_response << "HTTP/1.0 200 OK\nContent-Length: 2\n\nOK"
+    c.debug_dev = str = ''
+    c.get_content('http://example.com/')
+    assert_match(/Proxy-Authorization: Basic YWRtaW46YWRtaW4=/, str)
+  end
+
+  def test_oauth
+    c = HTTPClient.new
+    config = HTTPClient::OAuth::Config.new(
+      :realm => 'http://photos.example.net/',
+      :consumer_key => 'dpf43f3p2l4k3l03',
+      :consumer_secret => 'kd94hf93k423kf44',
+      :token => 'nnch734d00sl2jdk',
+      :secret => 'pfkkdhi9sl3r4s00',
+      :version => '1.0',
+      :signature_method => 'HMAC-SHA1'
+    )
+    config.debug_timestamp = '1191242096'
+    config.debug_nonce = 'kllo9940pd9333jh'
+    c.www_auth.oauth.set_config('http://photos.example.net/', config)
+    c.www_auth.oauth.challenge('http://photos.example.net/')
+    c.test_loopback_http_response << "HTTP/1.0 200 OK\nContent-Length: 2\n\nOK"
+    c.debug_dev = str = ''
+    c.get_content('http://photos.example.net/photos', :file => 'vacation.jpg', :size => 'original')
+    assert(str.index(%q(GET /photos?file=vacation.jpg&size=original)))
+    assert(str.index(%q(Authorization: OAuth realm="http://photos.example.net/", oauth_consumer_key="dpf43f3p2l4k3l03", oauth_nonce="kllo9940pd9333jh", oauth_signature="tR3%2BTy81lMeYAr%2FFid0kMTYa%2FWM%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1191242096", oauth_token="nnch734d00sl2jdk", oauth_version="1.0")))
+    #
+    c.test_loopback_http_response << "HTTP/1.0 200 OK\nContent-Length: 2\n\nOK"
+    c.debug_dev = str = ''
+    c.get_content('http://photos.example.net/photos?file=vacation.jpg&size=original')
+    assert(str.index(%q(GET /photos?file=vacation.jpg&size=original)))
+    assert(str.index(%q(Authorization: OAuth realm="http://photos.example.net/", oauth_consumer_key="dpf43f3p2l4k3l03", oauth_nonce="kllo9940pd9333jh", oauth_signature="tR3%2BTy81lMeYAr%2FFid0kMTYa%2FWM%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1191242096", oauth_token="nnch734d00sl2jdk", oauth_version="1.0")))
+    #
+    c.test_loopback_http_response << "HTTP/1.0 200 OK\nContent-Length: 2\n\nOK"
+    c.debug_dev = str = ''
+    c.post_content('http://photos.example.net/photos', :file => 'vacation.jpg', :size => 'original')
+    assert(str.index(%q(POST /photos)))
+    assert(str.index(%q(Authorization: OAuth realm="http://photos.example.net/", oauth_consumer_key="dpf43f3p2l4k3l03", oauth_nonce="kllo9940pd9333jh", oauth_signature="wPkvxykrw%2BBTdCcGqKr%2B3I%2BPsiM%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1191242096", oauth_token="nnch734d00sl2jdk", oauth_version="1.0")))
+  end
+end