bterlson-httpclient 2.1.4 → 2.1.5

data/lib/httpclient/cookie.rb

@@ -160,8 +160,10 @@ class WebAgent
 
     def parse(str, url)
       @url = url
+      # TODO: should not depend on join_quotedstr. scan with escape like CSV.
       cookie_elem = str.split(/;/)
       cookie_elem = join_quotedstr(cookie_elem, ';')
+      cookie_elem -= [""] # del empty elements, a cookie might included ";;"
       first_elem = cookie_elem.shift
       if first_elem !~ /([^=]*)(\=(.*))?/
 	return
@@ -170,7 +172,7 @@ class WebAgent
       @name = $1.strip
       @value = normalize_cookie_value($3)
       cookie_elem.each{|pair|
-	key, value = pair.split(/=/)  ## value may nil
+	key, value = pair.split(/=/, 2)  ## value may nil
 	key.strip!
         value = normalize_cookie_value(value)
 	case key.downcase

data/lib/httpclient/http.rb

@@ -320,7 +320,7 @@ module HTTP
         end
         if @chunked
           set('Transfer-Encoding', 'chunked')
-        elsif keep_alive or @body_size != 0
+        elsif @body_size and (keep_alive or @body_size != 0)
           set('Content-Length', @body_size.to_s)
         end
         if @http_version >= 1.1
@@ -623,7 +623,7 @@ module HTTP
       def new_connect_request(uri)
         m = new
         m.header.init_connect_request(uri)
-        m.header.body_size = 0
+        m.header.body_size = nil
         m
       end
 
@@ -645,8 +645,12 @@ module HTTP
         m.header.init_request(method, uri, query)
         m.body = Body.new
         m.body.init_request(body || '', boundary)
-        m.header.body_size = m.body.size
-        m.header.chunked = true if m.body.size.nil?
+        if body
+          m.header.body_size = m.body.size
+          m.header.chunked = true if m.body.size.nil?
+        else
+          m.header.body_size = nil
+        end
         m
       end
 

data/lib/httpclient/session.rb

@@ -445,7 +445,7 @@ class HTTPClient
     include SocketWrap
 
     def initialize(host, port, response)
-      super(StringIO.new(response))
+      super(response.is_a?(StringIO) ? response : StringIO.new(response))
       @host = host
       @port = port
     end
@@ -800,9 +800,13 @@ class HTTPClient
         maxbytes = @read_block_size
         maxbytes = @content_length if maxbytes > @content_length
         timeout(@receive_timeout, ReceiveTimeoutError) do
-          @socket.readpartial(maxbytes, buf) rescue EOFError
+          begin
+            @socket.readpartial(maxbytes, buf)
+          rescue EOFError
+            buf = nil
+          end
         end
-        if buf.length > 0
+        if buf && buf.length > 0
           @content_length -= buf.length
           yield buf
         else
@@ -840,7 +844,11 @@ class HTTPClient
       buf = ''
       while true
         timeout(@receive_timeout, ReceiveTimeoutError) do
-          @socket.readpartial(@read_block_size, buf) rescue EOFError
+          begin
+            @socket.readpartial(@read_block_size, buf)
+          rescue EOFError
+            buf = nil
+          end
         end
         if buf && buf.length > 0
           yield buf

data/lib/httpclient/ssl_config.rb

@@ -339,40 +339,78 @@ class HTTPClient
     end
 
     def load_cacerts
-      file = File.join(File.dirname(__FILE__), 'cacert.p7s')
-      if File.exist?(file)
-        dist_cert =<<__DIST_CERT__
------BEGIN CERTIFICATE-----
-MIIC/jCCAmegAwIBAgIBATANBgkqhkiG9w0BAQUFADBNMQswCQYDVQQGEwJKUDER
-MA8GA1UECgwIY3Rvci5vcmcxFDASBgNVBAsMC0RldmVsb3BtZW50MRUwEwYDVQQD
-DAxodHRwLWFjY2VzczIwHhcNMDcwOTExMTM1ODMxWhcNMDkwOTEwMTM1ODMxWjBN
-MQswCQYDVQQGEwJKUDERMA8GA1UECgwIY3Rvci5vcmcxFDASBgNVBAsMC0RldmVs
-b3BtZW50MRUwEwYDVQQDDAxodHRwLWFjY2VzczIwgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBALi66ujWtUCQm5HpMSyr/AAIFYVXC/dmn7C8TR/HMiUuW3waY4uX
-LFqCDAGOX4gf177pX+b99t3mpaiAjJuqc858D9xEECzhDWgXdLbhRqWhUOble4RY
-c1yWYC990IgXJDMKx7VAuZ3cBhdBxtlE9sb1ZCzmHQsvTy/OoRzcJCrTAgMBAAGj
-ge0wgeowDwYDVR0TAQH/BAUwAwEB/zAxBglghkgBhvhCAQ0EJBYiUnVieS9PcGVu
-U1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUJNE0GGaRKmN2qhnO
-FyBWVl4Qj6owDgYDVR0PAQH/BAQDAgEGMHUGA1UdIwRuMGyAFCTRNBhmkSpjdqoZ
-zhcgVlZeEI+qoVGkTzBNMQswCQYDVQQGEwJKUDERMA8GA1UECgwIY3Rvci5vcmcx
-FDASBgNVBAsMC0RldmVsb3BtZW50MRUwEwYDVQQDDAxodHRwLWFjY2VzczKCAQEw
-DQYJKoZIhvcNAQEFBQADgYEAH11tstSUuqFpMqoh/vM5l3Nqb8ygblbqEYQs/iG/
-UeQkOZk/P1TxB6Ozn2htJ1srqDpUsncFVZ/ecP19GkeOZ6BmIhppcHhE5WyLBcPX
-It5q1BW0PiAzT9LlEGoaiW0nw39so0Pr1whJDfc1t4fjdk+kSiMIzRHbTDvHWfpV
-nTA=
------END CERTIFICATE-----
-__DIST_CERT__
-        p7 = PKCS7.read_smime(File.open(file) { |f| f.read })
-        selfcert = X509::Certificate.new(dist_cert)
-        store = X509::Store.new
-        store.add_cert(selfcert)
-        if (p7.verify(nil, store, p7.data, 0))
-          set_trust_ca(file)
-        else
-          STDERR.puts("cacerts: #{file} loading failed")
+      [
+        [DIST_CERT, 'cacert.p7s'],
+        [DIST_CERT_SHA1, 'cacert_sha1.p7s']
+      ].each do |cert_str, ca_file|
+        file = File.join(File.dirname(__FILE__), ca_file)
+        if File.exist?(file)
+          p7 = PKCS7.read_smime(File.open(file) { |f| f.read })
+          selfcert = X509::Certificate.new(cert_str)
+          store = X509::Store.new
+          store.add_cert(selfcert)
+          if (p7.verify(nil, store, p7.data, 0))
+            set_trust_ca(file)
+            return
+          end
         end
       end
+      STDERR.puts("cacerts loading failed")
     end
+
+    DIST_CERT =<<__DIST_CERT__
+-----BEGIN CERTIFICATE-----
+MIID/TCCAuWgAwIBAgIBATANBgkqhkiG9w0BAQ0FADBLMQswCQYDVQQGEwJKUDER
+MA8GA1UECgwIY3Rvci5vcmcxFDASBgNVBAsMC0RldmVsb3BtZW50MRMwEQYDVQQD
+DApodHRwY2xpZW50MB4XDTA5MDUyMTEyMzkwNVoXDTM3MTIzMTIzNTk1OVowSzEL
+MAkGA1UEBhMCSlAxETAPBgNVBAoMCGN0b3Iub3JnMRQwEgYDVQQLDAtEZXZlbG9w
+bWVudDETMBEGA1UEAwwKaHR0cGNsaWVudDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAM2PlkdTH97zvIHoPIMj87wnNvpqIQUD7L/hlysO0XBsmR/XZUeU
+ZKB10JQqMXviWpTnU9KU6xGTx3EI4wfd2dpLwH/d4d7K4LngW1kY7kJlZeJhakno
+GzQ40RSI9WkQ0R9KOE888f7OkTBafcL8UyWFVIMhQBw2d9iNl4Jc69QojayCDoSX
+XbbEP0n8yi7HwIU3RFuX6DtMpOx4/1K7Z002ccOGJ3J9kHgeDQSQtF42cQYC7qj2
+67I/OQgnB7ycxTCP0E7bdXQg+zqsngrhaoNn/+I+CoO7nD4t4uQ+B4agALh4PPxs
+bQD9MCL+VurNGLYv0HVd+ZlLblpddC9PLTsCAwEAAaOB6zCB6DAPBgNVHRMBAf8E
+BTADAQH/MDEGCWCGSAGG+EIBDQQkFiJSdWJ5L09wZW5TU0wgR2VuZXJhdGVkIENl
+cnRpZmljYXRlMB0GA1UdDgQWBBRAnB6XlMoOcm7HVAw+JWxY205PHTAOBgNVHQ8B
+Af8EBAMCAQYwcwYDVR0jBGwwaoAUQJwel5TKDnJux1QMPiVsWNtOTx2hT6RNMEsx
+CzAJBgNVBAYTAkpQMREwDwYDVQQKDAhjdG9yLm9yZzEUMBIGA1UECwwLRGV2ZWxv
+cG1lbnQxEzARBgNVBAMMCmh0dHBjbGllbnSCAQEwDQYJKoZIhvcNAQENBQADggEB
+ABVFepybD5XqsBnOn/oDHvK0xAPMF4Ap4Ht1yMQLObg8paVhANSdqIevPlCr/mPL
+DRjcy+J1fCnE6lCfsfLdTgAjirqt8pm92NccxmJ8hTmMd3LWC1n+eYWaolqTCVRM
+Bpe8UY9enyXrFoudHlr9epr18E6As6VrCSfpXFZkD9WHVSWpzkB3qATu5qcDCzCH
+bI0755Mdm/1hKJCD4l69h3J3OhRIEUPJfHnPvM5wtiyC2dcE9itwE/wdVzBJeIBX
+JQm+Qj+K8qXcRTzZZGIBjw2n46xJgW6YncNCHU/WWfNCYwdkngHS/aN8IbEjhCwf
+viXFisVrDN/+pZZGMf67ZaY=
+-----END CERTIFICATE-----
+__DIST_CERT__
+
+    DIST_CERT_SHA1 =<<__DIST_CERT__
+-----BEGIN CERTIFICATE-----
+MIID/TCCAuWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJKUDER
+MA8GA1UECgwIY3Rvci5vcmcxFDASBgNVBAsMC0RldmVsb3BtZW50MRMwEQYDVQQD
+DApodHRwY2xpZW50MB4XDTA5MDYyNTE0MjUzN1oXDTEwMTIzMTIzNTk1OVowSzEL
+MAkGA1UEBhMCSlAxETAPBgNVBAoMCGN0b3Iub3JnMRQwEgYDVQQLDAtEZXZlbG9w
+bWVudDETMBEGA1UEAwwKaHR0cGNsaWVudDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAM2PlkdTH97zvIHoPIMj87wnNvpqIQUD7L/hlysO0XBsmR/XZUeU
+ZKB10JQqMXviWpTnU9KU6xGTx3EI4wfd2dpLwH/d4d7K4LngW1kY7kJlZeJhakno
+GzQ40RSI9WkQ0R9KOE888f7OkTBafcL8UyWFVIMhQBw2d9iNl4Jc69QojayCDoSX
+XbbEP0n8yi7HwIU3RFuX6DtMpOx4/1K7Z002ccOGJ3J9kHgeDQSQtF42cQYC7qj2
+67I/OQgnB7ycxTCP0E7bdXQg+zqsngrhaoNn/+I+CoO7nD4t4uQ+B4agALh4PPxs
+bQD9MCL+VurNGLYv0HVd+ZlLblpddC9PLTsCAwEAAaOB6zCB6DAPBgNVHRMBAf8E
+BTADAQH/MDEGCWCGSAGG+EIBDQQkFiJSdWJ5L09wZW5TU0wgR2VuZXJhdGVkIENl
+cnRpZmljYXRlMB0GA1UdDgQWBBRAnB6XlMoOcm7HVAw+JWxY205PHTAOBgNVHQ8B
+Af8EBAMCAQYwcwYDVR0jBGwwaoAUQJwel5TKDnJux1QMPiVsWNtOTx2hT6RNMEsx
+CzAJBgNVBAYTAkpQMREwDwYDVQQKDAhjdG9yLm9yZzEUMBIGA1UECwwLRGV2ZWxv
+cG1lbnQxEzARBgNVBAMMCmh0dHBjbGllbnSCAQIwDQYJKoZIhvcNAQEFBQADggEB
+AGKhgByl/ur6SBFFKJcISJONFRaxf2ji0l6ut9XO1H2BSOSRjUbsFDWdWZG+D24Q
+JKKseSWPWAC5uHq00sBWkvmtip+duESPeDEdumdBhdiUUgGamW2Ew2y4yAdAVDeG
+t1p2fs8SylQN6AMTG/+R+MGHxhvg+UELYLcvAjjcDW2VhDQaJ1eFEfcMW1zRtvvh
+LJmVErouwFKyAjwhbF6sNxmToSnbO1ciWwIILMsOBNHMETCp+SzkRDIRWIkm6m+q
+RwRyYoHysODGvnu8VXS1hGRr2GIxeBga7dAGa2VLE/iUQ0d4lEskYU+6C4ZLyAWF
+O89dvLNRzpL10MaWCYVREks=
+-----END CERTIFICATE-----
+__DIST_CERT__
   end
 
 

data/test/test_cookie.rb

@@ -168,6 +168,18 @@ class TestCookieManager < Test::Unit::TestCase
     assert_equal(Time.gm(2009,12,31,12,0,0), cookie.expires)
   end
 
+  def test_parse_double_semicolon()
+    str = "xmen=off,0,0,1;; path=\"/;;\"; domain=.excite.co.jp; expires=Wednesday, 31-Dec-2009 12:00:00 GMT"
+    @cm.parse(str,URI.parse('http://www.excite.co.jp'))
+    cookie = @cm.cookies[0]
+    assert_instance_of(WebAgent::Cookie, cookie)
+    assert_equal("xmen", cookie.name)
+    assert_equal("off,0,0,1", cookie.value)
+    assert_equal("/;;", cookie.path)
+    assert_equal(".excite.co.jp", cookie.domain)
+    assert_equal(Time.gm(2009,12,31,12,0,0), cookie.expires)
+  end
+
 #  def test_make_portlist()
 #    assert_equal([80,8080], @cm.instance_eval{make_portlist("80,8080")})
 #    assert_equal([80], @cm.instance_eval{make_portlist("80")})

data/test/test_http-access2.rb

@@ -109,7 +109,7 @@ class TestClient < Test::Unit::TestCase
     assert_equal("= Request", lines[0])
     assert_equal("! CONNECTION ESTABLISHED", lines[2])
     assert_equal("GET / HTTP/1.1", lines[3])
-    assert_equal("Host: localhost:#{Port}", lines[6])
+    assert_equal("Host: localhost:#{Port}", lines[5])
     @client.protocol_version = 'HTTP/1.1'
     str = ""
     @client.debug_dev = str

data/test/test_httpclient.rb

@@ -123,7 +123,7 @@ class TestHTTPClient < Test::Unit::TestCase
     assert_equal("= Request", lines[0])
     assert_equal("! CONNECTION ESTABLISHED", lines[2])
     assert_equal("GET / HTTP/1.1", lines[3])
-    assert_equal("Host: localhost:#{Port}", lines[6])
+    assert_equal("Host: localhost:#{Port}", lines[5])
     @client.protocol_version = 'HTTP/1.1'
     assert_equal('HTTP/1.1', @client.protocol_version)
     str = ""
@@ -262,6 +262,33 @@ class TestHTTPClient < Test::Unit::TestCase
     end
   end
 
+  def test_cookie_update_while_authentication
+    escape_noproxy do
+      @client.test_loopback_http_response << <<EOS
+HTTP/1.0 401\r
+Date: Fri, 19 Dec 2008 11:57:29 GMT\r
+Content-Type: text/plain\r
+Content-Length: 0\r
+WWW-Authenticate: Basic realm="hello"\r
+Set-Cookie: foo=bar; path=/; domain=.example.org; expires=#{Time.mktime(2030, 12, 31).httpdate}\r
+\r
+EOS
+      @client.test_loopback_http_response << <<EOS
+HTTP/1.1 200 OK\r
+Content-Length: 5\r
+Connection: close\r
+\r
+hello
+EOS
+      @client.debug_dev = str = ''
+      @client.set_auth("http://www.example.org/baz/", 'admin', 'admin')
+      assert_equal('hello', @client.get('http://www.example.org/baz/foo').content)
+      assert_match(/^Cookie: foo=bar/, str)
+      assert_match(/^Authorization: Basic YWRtaW46YWRtaW4=/, str)
+    end
+  end
+
+
   def test_proxy_ssl
     escape_noproxy do
       @client.proxy = 'http://admin:admin@localhost:8080/'
@@ -770,6 +797,62 @@ EOS
     assert_match(%r(http://rubyforge.org/account/login.php	foo	bar	1924873200	rubyforge.org	/login.php	1), str)
   end
 
+  def test_eof_error_length
+    io = StringIO.new('')
+    def io.gets(*arg)
+      @buf ||= ["HTTP/1.0 200 OK\n", "content-length: 123\n", "\n"]
+      @buf.shift
+    end
+    def io.readpartial(size, buf)
+      @second ||= false
+      if !@second
+        @second = '1st'
+        buf << "abc"
+        buf
+      elsif @second == '1st'
+        @second = '2nd'
+        raise EOFError.new
+      else
+        raise Exception.new
+      end
+    end
+    def io.eof?
+      true
+    end
+    @client.test_loopback_http_response << io
+    assert_nothing_raised do
+      @client.get('http://foo/bar')
+    end
+  end
+
+  def test_eof_error_rest
+    io = StringIO.new('')
+    def io.gets(*arg)
+      @buf ||= ["HTTP/1.0 200 OK\n", "\n"]
+      @buf.shift
+    end
+    def io.readpartial(size, buf)
+      @second ||= false
+      if !@second
+        @second = '1st'
+        buf << "abc"
+        buf
+      elsif @second == '1st'
+        @second = '2nd'
+        raise EOFError.new
+      else
+        raise Exception.new
+      end
+    end
+    def io.eof?
+      true
+    end
+    @client.test_loopback_http_response << io
+    assert_nothing_raised do
+      @client.get('http://foo/bar')
+    end
+  end
+
   def test_urify
     extend HTTPClient::Util
     assert_nil(urify(nil))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bterlson-httpclient
 version: !ruby/object:Gem::Version 
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors: 
 - NAKAMURA, Hiroshi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-27 00:00:00 -07:00
+date: 2009-07-02 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - lib/httpclient
 - lib/httpclient/auth.rb
 - lib/httpclient/cacert.p7s
+- lib/httpclient/cacert_sha1.p7s
 - lib/httpclient/connection.rb
 - lib/httpclient/cookie.rb
 - lib/httpclient/http.rb
@@ -80,7 +81,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: gives something like the functionality of libwww-perl (LWP) in Ruby
 test_files: []