httpclient 2.2.0.2 → 2.2.1

data/lib/httpclient.rb

@@ -229,7 +229,7 @@ require 'httpclient/cookie'
 #   ruby -rhttpclient -e 'p HTTPClient.head(ARGV.shift).header["last-modified"]' http://dev.ctor.org/
 #
 class HTTPClient
-  VERSION = '2.2.0.2'
+  VERSION = '2.2.1'
   RUBY_VERSION_STRING = "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
   /: (\S+) (\S+)/ =~ %q$Id$
   LIB_NAME = "(#{$1}/#{$2}, #{RUBY_VERSION_STRING})"
@@ -438,7 +438,7 @@ class HTTPClient
   #
   # Calling this method resets all existing sessions.
   def proxy=(proxy)
-    if proxy.nil?
+    if proxy.nil? || proxy.to_s.empty?
       @proxy = nil
       @proxy_auth.reset_challenge
     else
@@ -728,9 +728,9 @@ class HTTPClient
   # a HTTP request message body.
   #
   # When you pass an IO as a body, HTTPClient sends it as a HTTP request with
-  # chunked encoding (Transfer-Encoding: chunked in HTTP header).  Bear in mind
-  # that some server application does not support chunked request.  At least
-  # cgi.rb does not support it.
+  # chunked encoding (Transfer-Encoding: chunked in HTTP header) if IO does not
+  # respond to :read. Bear in mind that some server application does not support
+  # chunked request.  At least cgi.rb does not support it.
   def request(method, uri, *args, &block)
     query, body, header, follow_redirect = keyword_argument(args, :query, :body, :header, :follow_redirect)
     if [:post, :put].include?(method)

data/lib/httpclient/cacert.p7s

@@ -1,9 +1,9 @@
 MIME-Version: 1.0
-Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg="sha1"; boundary="----FD1775D1D9127483D5635511E610AF67"
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg="sha1"; boundary="----FC1E47CA462F4279D20B7F02AEA7E734"
 
 This is an S/MIME signed message
 
-------FD1775D1D9127483D5635511E610AF67
+------FC1E47CA462F4279D20B7F02AEA7E734
 -----BEGIN CERTIFICATE-----
 MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
 MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
@@ -1813,7 +1813,7 @@ lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
 7M2CYfE45k+XmCpajQ==
 -----END CERTIFICATE-----
 
-------FD1775D1D9127483D5635511E610AF67
+------FC1E47CA462F4279D20B7F02AEA7E734
 Content-Type: application/pkcs7-signature; name="smime.p7s"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="smime.p7s"
@@ -1843,16 +1843,16 @@ BO7mpwMLMIdsjTvnkx2b/WEokIPiXr2Hcnc6FEgRQ8l8ec+8znC2LILZ1wT2K3AT
 o3whsSOELB++JcWKxWsM3/6llkYx/rtlpjGCAiswggInAgEBMFAwSzELMAkGA1UE
 BhMCSlAxETAPBgNVBAoMCGN0b3Iub3JnMRQwEgYDVQQLDAtEZXZlbG9wbWVudDET
 MBEGA1UEAwwKaHR0cGNsaWVudAIBATAJBgUrDgMCGgUAoIGxMBgGCSqGSIb3DQEJ
-AzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTExMDQxOTEzMTk1MFowIwYJ
+AzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTExMDUyMjA4NTEyMFowIwYJ
 KoZIhvcNAQkEMRYEFB6px2QzZcvvEHTjt2rAmZJQzfDEMFIGCSqGSIb3DQEJDzFF
 MEMwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMCAgFAMAcG
-BSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0GCSqGSIb3DQEBAQUABIIBAD4EMqXaqm6w
-loVOMuk2Etbhp9jBFykE3fOB5WUTTkEH9sgI04Ajoc6CBjud97ngG+WVfK9JK1zG
-D5uEI+8IV5l4N38kzV/CJ3oomMtXlwPvzXYXcHeN3FAPcNwHxKSswMEOyCmn1Xh7
-3UBvJBiMuqZfCuM63n0ozj5fiYCBUUnhX3fb2pcmswhO8PDEuA2XoYS5sLAmqA20
-4mklFS4ejN1dmWcJY+cHaS45+pYfzFXtZDaOR7WU+vYIydMoTxBOgVbrjnlciZc0
-eomLCA65FMf8adnS658gfqzstjp7Sq81G7uniUQdipK4BA6uU+Qeg0LRbMSaV4VG
-8ML4DnOTXME=
+BSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0GCSqGSIb3DQEBAQUABIIBAL1U0w4bM8Qr
+qYow95JP8oCG/ObfF6vFgo3h50kC/iXuKz9092VcUxleieiRHNf4fdv0snWmZD6H
+aOdxaKaJYdx0ZX6nEnPIYpIZ7w7M3RQhd/BLajIHft4sl0MG5AoDBhp1xLicuHUA
+EN0a0Zcv2cqHAxu/EiaVfNHyNL1lWPu0MlpNEOh6tBc9kjKplhaZgX7yqzkGXiJj
+pTyyJ2W+iUUyD4qH2bLGVjXeruK8SKmbsOsS/EbDH/pibY7GyY+UlMyeNo9LmVcH
+hX93iPwUHfNQLfUDrjVcdx7okIQvSJrg9X3brv4NccRFa/PtqH9RkG5tFH3xnoQq
+/Q1ATdBt6C4=
 
-------FD1775D1D9127483D5635511E610AF67--
+------FC1E47CA462F4279D20B7F02AEA7E734--
 

data/lib/httpclient/cacert_sha1.p7s

@@ -1,9 +1,9 @@
 MIME-Version: 1.0
-Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg="sha1"; boundary="----A7A3ED9F71494B934F978FF49CCFDAA8"
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg="sha1"; boundary="----C57026F268CF9C1DB42129AC956CD0BC"
 
 This is an S/MIME signed message
 
-------A7A3ED9F71494B934F978FF49CCFDAA8
+------C57026F268CF9C1DB42129AC956CD0BC
 -----BEGIN CERTIFICATE-----
 MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
 MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
@@ -1813,7 +1813,7 @@ lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
 7M2CYfE45k+XmCpajQ==
 -----END CERTIFICATE-----
 
-------A7A3ED9F71494B934F978FF49CCFDAA8
+------C57026F268CF9C1DB42129AC956CD0BC
 Content-Type: application/pkcs7-signature; name="smime.p7s"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="smime.p7s"
@@ -1843,16 +1843,16 @@ YMEtiMT3acFCZEjamCfXIcfLu6Jr7dYc6bvZqLd8tKkKFy01dOSEXIgHtDsthHbv
 t9v4ZZy8AJlYcuqOLLbIs9nL0lnCcKLjITGCAiswggInAgEBMFAwSzELMAkGA1UE
 BhMCSlAxETAPBgNVBAoMCGN0b3Iub3JnMRQwEgYDVQQLDAtEZXZlbG9wbWVudDET
 MBEGA1UEAwwKaHR0cGNsaWVudAIBAjAJBgUrDgMCGgUAoIGxMBgGCSqGSIb3DQEJ
-AzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTExMDQxOTEzMjAwNFowIwYJ
+AzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTExMDUyMjA4NTE0M1owIwYJ
 KoZIhvcNAQkEMRYEFB6px2QzZcvvEHTjt2rAmZJQzfDEMFIGCSqGSIb3DQEJDzFF
 MEMwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMCAgFAMAcG
-BSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0GCSqGSIb3DQEBAQUABIIBACVjHueimi/s
-rHZxaiZMz45S2uXLynpAco67tGw/iguWTk3hKHQ3Dwp2iFmqIYaAPjNeYt/eV7qr
-A+3DVL64tTxSvnNU/lgFOTmq1p8jITrKwdVYBvwWaSNURvTy3bpt3W962hdfmqAL
-CXOdo7h7nXL5haHLFPPw4Hca9Z9mFpM6x1fIjSk/zSRo2W1RgXxva/4F2LKHREcD
-OPfDbTN517z7u+mQ/J7D+4JU8zLQZA8khM0JF/PhuKzy2PxPqrEREZcx+EFy3JHA
-Q6Fdof6LYHrDEZppOrEtJB7UVhoQ1Ksw25T9dMjB2PqLK3hafUtC10iOAQxIfEDH
-ANx4tC98GH8=
+BSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0GCSqGSIb3DQEBAQUABIIBAEFfFngL8sd6
++P5CqVUuK7XCov5ALywlJJiDnk8LWaFmoM8oQldYOgUE7+Incryzku2XQXQqVXVM
+TAXSOOsvoJTCHeNopBpJzUEImrm3Cwc7gSS4Zss9l7JtrI+vnWm1DUbmicWkUB+1
+UDkIGLhRpTdlzIoa/aJi2Di2BMfQ374ej//nYQIOc4GsyDmRyR+Q07P2DLTkQfTF
+1F88F+mduib+pz3+BsqGLERONSZOEfiNOZFTfNlc77EzgUk/XcXfFohCVSXXjNRJ
+oPM4EGs9fZpt8t3f8NG4qiGb6HM/mt1FQhjUrlzXh8VHKW7zYWFSS64I2lml4x82
+xlt2BAWZwnE=
 
-------A7A3ED9F71494B934F978FF49CCFDAA8--
+------C57026F268CF9C1DB42129AC956CD0BC--
 

data/lib/httpclient/http.rb

@@ -442,18 +442,18 @@ module HTTP
       def dump(header = '', dev = '')
         if @body.is_a?(Parts)
           dev << header
-          buf = ''
           @body.parts.each do |part|
             if Message.file?(part)
               reset_pos(part)
-              while !part.read(@chunk_size, buf).nil?
-                dev << buf
-              end
-              part.rewind
+              dump_file(part, dev)
             else
               dev << part
             end
           end
+        elsif Message.file?(@body)
+          dev << header
+          reset_pos(@body)
+          dump_file(@body, dev)
         elsif @body
           dev << header + @body
         else
@@ -498,11 +498,11 @@ module HTTP
 
       def set_content(body, boundary = nil)
         if body.respond_to?(:read)
-          # uses Transfer-Encoding: chunked.  bear in mind that server may not
-          # support it.  at least ruby's CGI doesn't.
+          # uses Transfer-Encoding: chunked if body does not respond to :size.
+          # bear in mind that server may not support it. at least ruby's CGI doesn't.
           @body = body
           remember_pos(@body)
-          @size = nil
+          @size = body.respond_to?(:size) ? body.size - body.pos : nil
         elsif boundary and Message.multiparam_query?(body)
           @body = build_query_multipart_str(body, boundary)
           @size = @body.size
@@ -521,6 +521,13 @@ module HTTP
         io.pos = @positions[io] if @positions.key?(io)
       end
 
+      def dump_file(io, dev)
+        buf = ''
+        while !io.read(@chunk_size, buf).nil?
+          dev << buf
+        end
+      end
+
       def dump_chunks(io, dev)
         buf = ''
         while !io.read(@chunk_size, buf).nil?

data/lib/httpclient/session.rb

@@ -124,7 +124,7 @@ class HTTPClient
       @protocol_version = nil
       @debug_dev = client.debug_dev
       @socket_sync = true
-      @chunk_size = 4096
+      @chunk_size = ::HTTP::Message::Body::DEFAULT_CHUNK_SIZE
 
       @connect_timeout = 60
       @connect_retry = 1
@@ -899,6 +899,7 @@ class HTTPClient
           begin
             @socket.readpartial(maxbytes, buf)
           rescue EOFError
+            close
             buf = nil
           end
         end
@@ -917,6 +918,10 @@ class HTTPClient
       buf = ''
       while true
         len = @socket.gets(RS)
+        if len.nil? # EOF
+          close
+          return
+        end
         @chunk_length = len.hex
         if @chunk_length == 0
           @content_length = 0

data/lib/httpclient/ssl_config.rb

@@ -146,19 +146,23 @@ class HTTPClient
     # Calling this method resets all existing sessions.
     def add_trust_ca(trust_ca_file_or_hashed_dir)
       @cacerts_loaded = true # avoid lazy override
+      add_trust_ca_to_store(@cert_store, trust_ca_file_or_hashed_dir)
+      change_notify
+    end
+    alias set_trust_ca add_trust_ca
+
+    def add_trust_ca_to_store(cert_store, trust_ca_file_or_hashed_dir)
       if FileTest.directory?(trust_ca_file_or_hashed_dir)
-        @cert_store.add_path(trust_ca_file_or_hashed_dir)
+        cert_store.add_path(trust_ca_file_or_hashed_dir)
       else
-        @cert_store.add_file(trust_ca_file_or_hashed_dir)
+        cert_store.add_file(trust_ca_file_or_hashed_dir)
       end
-      change_notify
     end
-    alias set_trust_ca add_trust_ca
 
     # Loads default trust anchors.
     # Calling this method resets all existing sessions.
     def load_trust_ca
-      load_cacerts
+      load_cacerts(@cert_store)
       change_notify
     end
 
@@ -283,13 +287,13 @@ class HTTPClient
     # Default callback for verification: only dumps error.
     def default_verify_callback(is_ok, ctx)
       if $DEBUG
-        puts "#{ is_ok ? 'ok' : 'ng' }: #{ctx.current_cert.subject}"
+        warn("#{ is_ok ? 'ok' : 'ng' }: #{ctx.current_cert.subject}")
       end
       if !is_ok
         depth = ctx.error_depth
         code = ctx.error
         msg = ctx.error_string
-        STDERR.puts "at depth #{depth} - #{code}: #{msg}"
+        warn("at depth #{depth} - #{code}: #{msg}")
       end
       is_ok
     end
@@ -300,7 +304,7 @@ class HTTPClient
         depth = ctx.error_depth
         code = ctx.error
         msg = ctx.error_string
-        STDERR.puts "at depth #{depth} - #{code}: #{msg}" if $DEBUG
+        warn("at depth #{depth} - #{code}: #{msg}") if $DEBUG
         return false
       end
 
@@ -333,13 +337,13 @@ class HTTPClient
       end
 
       if self_signed
-        STDERR.puts 'self signing CA' if $DEBUG
+        warn('self signing CA') if $DEBUG
         return true
       elsif ca
-        STDERR.puts 'middle level CA' if $DEBUG
+        warn('middle level CA') if $DEBUG
         return true
       elsif server_auth
-        STDERR.puts 'for server authentication' if $DEBUG
+        warn('for server authentication') if $DEBUG
         return true
       end
 
@@ -352,7 +356,7 @@ class HTTPClient
       @client.reset_all
     end
 
-    def load_cacerts
+    def load_cacerts(cert_store)
       [
         [DIST_CERT, 'cacert.p7s'],
         [DIST_CERT_SHA1, 'cacert_sha1.p7s']
@@ -364,12 +368,12 @@ class HTTPClient
           store = X509::Store.new
           store.add_cert(selfcert)
           if (p7.verify(nil, store, p7.data, 0))
-            add_trust_ca(file)
+            add_trust_ca_to_store(cert_store, file)
             return
           end
         end
       end
-      STDERR.puts("cacerts loading failed")
+      warn("cacerts loading failed")
     end
 
     DIST_CERT =<<__DIST_CERT__

data/sample/async.rb

@@ -0,0 +1,8 @@
+require 'httpclient'
+
+c = HTTPClient.new
+conn = c.get_async("http://dev.ctor.org/")
+io = conn.pop.content
+while str = io.read(40)
+  p str
+end

data/sample/auth.rb

@@ -0,0 +1,11 @@
+require 'httpclient'
+
+c = HTTPClient.new
+c.debug_dev = STDOUT
+
+# for Proxy authentication: supports Basic, Negotiate and NTLM.
+#c.set_proxy_auth("admin", "admin")
+
+# for WWW authentication: supports Basic, Digest and Negotiate.
+c.set_auth("http://dev.ctor.org/http-access2/", "user", "user")
+p c.get("http://dev.ctor.org/http-access2/login")

data/sample/cookie.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+$:.unshift(File.join('..', 'lib'))
+require 'httpclient'
+
+proxy = ENV['HTTP_PROXY']
+clnt = HTTPClient.new(proxy)
+clnt.set_cookie_store("cookie.dat")
+clnt.debug_dev = STDOUT if $DEBUG
+
+while urlstr = ARGV.shift
+  response = clnt.get(urlstr){ |data|
+    print data
+  }
+  p response.contenttype
+end
+
+clnt.save_cookie_store

data/sample/dav.rb

@@ -0,0 +1,103 @@
+require 'uri'
+require 'httpclient'
+
+class DAV
+  attr_reader :headers
+
+  def initialize(uri = nil)
+    @uri = nil
+    @headers = {}
+    open(uri) if uri
+    proxy = ENV['HTTP_PROXY'] || ENV['http_proxy'] || nil
+    @client = HTTPClient.new(proxy)
+  end
+
+  def open(uri)
+    @uri = if uri.is_a?(URI)
+	uri
+      else
+	URI.parse(uri)
+      end
+  end
+
+  def set_basic_auth(user_id, passwd)
+    @client.set_basic_auth(@uri, user_id, passwd)
+  end
+
+  # TODO: propget/propset support
+
+  def propfind(target)
+    target_uri = @uri + target
+    res = @client.propfind(target_uri)
+    res.body.content
+  end
+
+  def get(target, local = nil)
+    local ||= target
+    target_uri = @uri + target
+    if FileTest.exist?(local)
+      raise RuntimeError.new("File #{ local } exists.")
+    end
+    f = File.open(local, "wb")
+    res = @client.get(target_uri, nil, @headers) do |data|
+      f << data
+    end
+    f.close
+    STDOUT.puts("#{ res.header['content-length'][0] } bytes saved to file #{ target }.")
+  end
+
+  def debug_dev=(dev)
+    @client.debug_dev = dev
+  end
+
+  def get_content(target)
+    target_uri = @uri + target
+    @client.get_content(target_uri, nil, @headers)
+  end
+
+  def put_content(target, content)
+    target_uri = @uri + target
+    res = @client.put(target_uri, content, @headers)
+    if res.status < 200 or res.status >= 300
+      raise "HTTP PUT failed: #{res.inspect}"
+    end
+  end
+
+  class Mock
+    attr_reader :headers
+
+    def initialize(uri = nil)
+      @uri = nil
+      @headers = {}
+      open(uri) if uri
+
+      @cache = {}
+    end
+
+    def open(uri)
+      @uri = uri.is_a?(URI) ?  uri : URI.parse(uri)
+    end
+
+    def set_basic_auth(user_id, passwd)
+      # ignore
+    end
+
+    def propfind(target)
+      # not found
+      nil
+    end
+
+    def get(target, local = nil)
+      # ignore
+    end
+
+    def get_content(target)
+      @cache[target]
+    end
+
+    def put_content(target, content)
+      @cache[target] = content
+      nil
+    end
+  end
+end

data/sample/howto.rb

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+
+$:.unshift(File.join('..', 'lib'))
+require 'httpclient'
+
+proxy = ENV['HTTP_PROXY']
+clnt = HTTPClient.new(proxy)
+clnt.set_cookie_store("cookie.dat")
+target = ARGV.shift || "http://localhost/foo.cgi"
+
+puts
+puts '= GET content directly'
+puts clnt.get_content(target)
+
+puts '= GET result object'
+result = clnt.get(target)
+puts '== Header object'
+p result.header
+puts "== Content-type"
+p result.contenttype
+puts '== Body object'
+p result.body
+puts '== Content'
+print result.content
+puts '== GET with Block'
+clnt.get(target) do |str|
+  puts str
+end
+
+puts
+puts '= GET with query'
+puts clnt.get(target, { "foo" => "bar", "baz" => "quz" }).content
+
+puts
+puts '= GET with query 2'
+puts clnt.get(target, [["foo", "bar1"], ["foo", "bar2"]]).content
+
+clnt.debug_dev = STDERR
+puts
+puts '= GET with extra header'
+puts clnt.get(target, nil, { "SOAPAction" => "HelloWorld" }).content
+
+puts
+puts '= GET with extra header 2'
+puts clnt.get(target, nil, [["Accept", "text/plain"], ["Accept", "text/html"]]).content
+
+clnt.debug_dev = nil
+
+clnt.save_cookie_store