httpclient 2.1.1 → 2.1.2

data/lib/httpclient.rb

@@ -52,9 +52,9 @@ require 'httpclient/cookie'
 #
 class HTTPClient
 
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
   RUBY_VERSION_STRING = "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-  s = %w$Id: httpclient.rb 178 2007-08-28 13:47:27Z nahi $
+  s = %w$Id: httpclient.rb 187 2007-09-22 14:15:42Z nahi $
   RCS_FILE, RCS_REVISION = s[1][/.*(?=,v$)/], s[2]
 
   SSLEnabled = begin
@@ -64,6 +64,13 @@ class HTTPClient
       false
     end
 
+  NTLMEnabled = begin
+      require 'net/ntlm'
+      true
+    rescue LoadError
+      false
+    end
+
   SSPIEnabled = begin
       require 'win32/sspi'
       true
@@ -152,7 +159,7 @@ class SSLConfig # :nodoc:
     @timeout = nil
     @options = defined?(OpenSSL::SSL::OP_ALL) ?
       OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_SSLv2 : nil
-    @ciphers = "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"
+    @ciphers = "ALL:!ADH:!LOW:!EXP:!MD5:+SSLv2:@STRENGTH"
     load_cacerts
   end
 
@@ -357,9 +364,9 @@ private
       require 'openssl'
       dist_cert =<<__DIST_CERT__
 -----BEGIN CERTIFICATE-----
-MIIC/jCCAmegAwIBAgIBADANBgkqhkiG9w0BAQUFADBNMQswCQYDVQQGEwJKUDER
+MIIC/jCCAmegAwIBAgIBATANBgkqhkiG9w0BAQUFADBNMQswCQYDVQQGEwJKUDER
 MA8GA1UECgwIY3Rvci5vcmcxFDASBgNVBAsMC0RldmVsb3BtZW50MRUwEwYDVQQD
-DAxodHRwLWFjY2VzczIwHhcNMDcwNDI4MjM1NTI0WhcNMDkwNDI3MjM1NTI0WjBN
+DAxodHRwLWFjY2VzczIwHhcNMDcwOTExMTM1ODMxWhcNMDkwOTEwMTM1ODMxWjBN
 MQswCQYDVQQGEwJKUDERMA8GA1UECgwIY3Rvci5vcmcxFDASBgNVBAsMC0RldmVs
 b3BtZW50MRUwEwYDVQQDDAxodHRwLWFjY2VzczIwgZ8wDQYJKoZIhvcNAQEBBQAD
 gY0AMIGJAoGBALi66ujWtUCQm5HpMSyr/AAIFYVXC/dmn7C8TR/HMiUuW3waY4uX
@@ -369,11 +376,11 @@ ge0wgeowDwYDVR0TAQH/BAUwAwEB/zAxBglghkgBhvhCAQ0EJBYiUnVieS9PcGVu
 U1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUJNE0GGaRKmN2qhnO
 FyBWVl4Qj6owDgYDVR0PAQH/BAQDAgEGMHUGA1UdIwRuMGyAFCTRNBhmkSpjdqoZ
 zhcgVlZeEI+qoVGkTzBNMQswCQYDVQQGEwJKUDERMA8GA1UECgwIY3Rvci5vcmcx
-FDASBgNVBAsMC0RldmVsb3BtZW50MRUwEwYDVQQDDAxodHRwLWFjY2VzczKCAQAw
-DQYJKoZIhvcNAQEFBQADgYEAcBAe+z1vn9CnrN8zZkb+mN1Uw3S0vUeebHtlXNUa
-orzaGDx5uOiisUyAgTAlnDYQJ0i5M2tQVCAazicAo1dbEM+F2pvhJfRrDJic+rR+
-tmZsdMCfuxCsy8gnYUT9PXbO/RMz7nvXZqxAcW5Ks1Stv0cTVjxL5IjCkfvAr/fj
-XQ0=
+FDASBgNVBAsMC0RldmVsb3BtZW50MRUwEwYDVQQDDAxodHRwLWFjY2VzczKCAQEw
+DQYJKoZIhvcNAQEFBQADgYEAH11tstSUuqFpMqoh/vM5l3Nqb8ygblbqEYQs/iG/
+UeQkOZk/P1TxB6Ozn2htJ1srqDpUsncFVZ/ecP19GkeOZ6BmIhppcHhE5WyLBcPX
+It5q1BW0PiAzT9LlEGoaiW0nw39so0Pr1whJDfc1t4fjdk+kSiMIzRHbTDvHWfpV
+nTA=
 -----END CERTIFICATE-----
 __DIST_CERT__
       p7 = OpenSSL::PKCS7.read_smime(File.open(file) { |f| f.read })
@@ -517,6 +524,79 @@ end
 #
 class NegotiateAuth # :nodoc:
   attr_reader :scheme
+  attr_reader :ntlm_opt
+
+  def initialize
+    @auth = {}
+    @auth_default = nil
+    @challenge = {}
+    @scheme = "Negotiate"
+    @ntlm_opt = {
+      :ntlmv2 => true
+    }
+  end
+
+  def reset_challenge
+    @challenge.clear
+  end
+
+  def set(uri, user, passwd)
+    if uri
+      uri = Util.uri_dirname(uri)
+      @auth[uri] = [user, passwd]
+    else
+      @auth_default = [user, passwd]
+    end
+  end
+
+  def get(req)
+    return nil unless NTLMEnabled
+    target_uri = req.header.request_uri
+    param = Util.hash_find_value(@challenge) { |uri, param|
+      Util.uri_part_of(target_uri, uri)
+    }
+    return nil unless param
+    user, passwd = Util.hash_find_value(@auth) { |uri, auth_data|
+      Util.uri_part_of(target_uri, uri)
+    }
+    unless user
+      user, passwd = @auth_default
+    end
+    return nil unless user
+    state = param[:state]
+    authphrase = param[:authphrase]
+    case state
+    when :init
+      t1 = Net::NTLM::Message::Type1.new
+      return t1.encode64
+    when :response
+      t2 = Net::NTLM::Message.decode64(authphrase)
+      t3 = t2.response({:user => user, :password => passwd}, @ntlm_opt)
+      return t3.encode64
+    end
+    nil
+  end
+
+  def challenge(uri, param_str)
+    return false unless NTLMEnabled
+    if param_str.nil? or @challenge[uri].nil?
+      c = @challenge[uri] = {}
+      c[:state] = :init
+      c[:authphrase] = ""
+    else
+      c = @challenge[uri]
+      c[:state] = :response
+      c[:authphrase] = param_str
+    end
+    true
+  end
+end
+
+
+# HTTPClient::SSPINegotiateAuth 
+#
+class SSPINegotiateAuth # :nodoc:
+  attr_reader :scheme
 
   def initialize
     @challenge = {}
@@ -607,6 +687,7 @@ class WWWAuth < AuthFilterBase # :nodoc:
   def set_auth(uri, user, passwd)
     @basic_auth.set(uri, user, passwd)
     @digest_auth.set(uri, user, passwd)
+    @negotiate_auth.set(uri, user, passwd)
   end
 
   def filter_request(req)
@@ -642,12 +723,14 @@ end
 class ProxyAuth < AuthFilterBase # :nodoc:
   attr_reader :basic_auth
   attr_reader :negotiate_auth
+  attr_reader :sspi_negotiate_auth
 
   def initialize
     @basic_auth = BasicAuth.new
     @negotiate_auth = NegotiateAuth.new
+    @sspi_negotiate_auth = SSPINegotiateAuth.new
     # sort authenticators by priority
-    @authenticator = [@negotiate_auth, @basic_auth]
+    @authenticator = [@negotiate_auth, @sspi_negotiate_auth, @basic_auth]
   end
 
   def reset_challenge
@@ -658,6 +741,7 @@ class ProxyAuth < AuthFilterBase # :nodoc:
 
   def set_auth(user, passwd)
     @basic_auth.set(nil, user, passwd)
+    @negotiate_auth.set(nil, user, passwd)
   end
 
   def filter_request(req)
@@ -1093,11 +1177,10 @@ end
 
 # HTTPClient::DebugSocket -- debugging support
 #
-class DebugSocket
-  include SocketWrap
+module DebugSocket
+  extend SocketWrap
 
-  def initialize(socket, debug_dev)
-    super(socket)
+  def debug_dev=(debug_dev)
     @debug_dev = debug_dev
   end
 
@@ -1415,7 +1498,8 @@ private
       end
       if @debug_dev
         @debug_dev << "! CONNECTION ESTABLISHED\n"
-        socket = DebugSocket.new(socket, @debug_dev)
+        socket.extend(DebugSocket)
+        socket.debug_dev = @debug_dev
       end
     rescue SystemCallError => e
       e.message << " (#{site})"
@@ -1489,7 +1573,7 @@ private
     return [@version, @status, @reason]
   end
 
-  StatusParseRegexp = %r(\AHTTP/(\d+\.\d+)\s+(\d+)(?:\s+([^\r\n]+))?\r?\n\z)
+  StatusParseRegexp = %r(\AHTTP/(\d+\.\d+)\s+(\d\d\d)\s*([^\r\n]+)?\r?\n\z)
   def parse_header(socket)
     begin
       timeout(@receive_timeout) do

data/lib/httpclient/cacert.p7s

@@ -1,9 +1,9 @@
 MIME-Version: 1.0
-Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg=sha1; boundary="----5D1564AD4B7AA41C792F4EA6897F9BBC"
+Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg=sha1; boundary="----8B5C3F7F4B46AC7A36EDE5247D3D6E76"
 
 This is an S/MIME signed message
 
-------5D1564AD4B7AA41C792F4EA6897F9BBC
+------8B5C3F7F4B46AC7A36EDE5247D3D6E76
 -----BEGIN CERTIFICATE-----
 MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
 MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
@@ -420,19 +420,6 @@ T9oT95mvPtDPjqZyorPDBZrJJ32SzH5SjbOrcG2eiZ9N6xp1wpiq1QIW1wyKvyXk
 ysiUFnZflGEo8IWnObvXi9moshMdVAk0JH0ggX1mfqKQdFwQxr3sqxvC
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIB+jCCAWMCAgGjMA0GCSqGSIb3DQEBBAUAMEUxCzAJBgNVBAYTAlVTMRgwFgYD
-VQQKEw9HVEUgQ29ycG9yYXRpb24xHDAaBgNVBAMTE0dURSBDeWJlclRydXN0IFJv
-b3QwHhcNOTYwMjIzMjMwMTAwWhcNMDYwMjIzMjM1OTAwWjBFMQswCQYDVQQGEwJV
-UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMRwwGgYDVQQDExNHVEUgQ3liZXJU
-cnVzdCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC45k+625h8cXyv
-RLfTD0bZZOWTwUKOx7pJjTUteueLveUFMVnGsS8KDPufpz+iCWaEVh43KRuH6X4M
-ypqfpX/1FZSj1aJGgthoTNE3FQZor734sLPwKfWVWgkWYXcKIiXUT0Wqx73llt/5
-1KiOQswkwB6RJ0q1bQaAYznEol44AwIDAQABMA0GCSqGSIb3DQEBBAUAA4GBABKz
-dcZfHeFhVYAA1IFLezEPI2PnPfMD+fQ2qLvZ46WXTeorKeDWanOB5sCJo9Px4KWl
-IjeaY8JIILTbcuPI9tl8vrGvU9oUtCG41tWW4/5ODFlitppK+ULdjG+BqXH/9Apy
-bW1EDp3zdHSo1TRJ6V6e6bR64eVaH4QwnNOfpSXY
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
 MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD
 VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
 bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv
@@ -915,16 +902,16 @@ YQO2WxZpO8ZECAyIUwxrl0nHPjXcbLm7qt9cuzovk2C2qUtN8iD3zV9/ZHuO3ABc
 1/p3yjkWWW8O6tO1g39NTUJWdrTJXwT4OPjr0l91X817/OWOgHz8UA==
 -----END CERTIFICATE-----
 
-------5D1564AD4B7AA41C792F4EA6897F9BBC
+------8B5C3F7F4B46AC7A36EDE5247D3D6E76
 Content-Type: application/x-pkcs7-signature; name="smime.p7s"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="smime.p7s"
 
 MIIE5gYJKoZIhvcNAQcCoIIE1zCCBNMCAQExCzAJBgUrDgMCGgUAMAsGCSqGSIb3
-DQEHAaCCAwIwggL+MIICZ6ADAgECAgEAMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
+DQEHAaCCAwIwggL+MIICZ6ADAgECAgEBMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
 BAYTAkpQMREwDwYDVQQKDAhjdG9yLm9yZzEUMBIGA1UECwwLRGV2ZWxvcG1lbnQx
-FTATBgNVBAMMDGh0dHAtYWNjZXNzMjAeFw0wNzA0MjgyMzU1MjRaFw0wOTA0Mjcy
-MzU1MjRaME0xCzAJBgNVBAYTAkpQMREwDwYDVQQKDAhjdG9yLm9yZzEUMBIGA1UE
+FTATBgNVBAMMDGh0dHAtYWNjZXNzMjAeFw0wNzA5MTExMzU4MzFaFw0wOTA5MTAx
+MzU4MzFaME0xCzAJBgNVBAYTAkpQMREwDwYDVQQKDAhjdG9yLm9yZzEUMBIGA1UE
 CwwLRGV2ZWxvcG1lbnQxFTATBgNVBAMMDGh0dHAtYWNjZXNzMjCBnzANBgkqhkiG
 9w0BAQEFAAOBjQAwgYkCgYEAuLrq6Na1QJCbkekxLKv8AAgVhVcL92afsLxNH8cy
 JS5bfBpji5csWoIMAY5fiB/Xvulf5v323ealqICMm6pzznwP3EQQLOENaBd0tuFG
@@ -934,19 +921,19 @@ dWJ5L09wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQk0TQY
 ZpEqY3aqGc4XIFZWXhCPqjAOBgNVHQ8BAf8EBAMCAQYwdQYDVR0jBG4wbIAUJNE0
 GGaRKmN2qhnOFyBWVl4Qj6qhUaRPME0xCzAJBgNVBAYTAkpQMREwDwYDVQQKDAhj
 dG9yLm9yZzEUMBIGA1UECwwLRGV2ZWxvcG1lbnQxFTATBgNVBAMMDGh0dHAtYWNj
-ZXNzMoIBADANBgkqhkiG9w0BAQUFAAOBgQBwEB77PW+f0Kes3zNmRv6Y3VTDdLS9
-R55se2Vc1RqivNoYPHm46KKxTICBMCWcNhAnSLkza1BUIBrOJwCjV1sQz4Xam+El
-9GsMmJz6tH62Zmx0wJ+7EKzLyCdhRP09ds79EzPue9dmrEBxbkqzVK2/RxNWPEvk
-iMKR+8Cv9+NdDTGCAawwggGoAgEBMFIwTTELMAkGA1UEBhMCSlAxETAPBgNVBAoM
+ZXNzMoIBATANBgkqhkiG9w0BAQUFAAOBgQAfXW2y1JS6oWkyqiH+8zmXc2pvzKBu
+VuoRhCz+Ib9R5CQ5mT8/VPEHo7OfaG0nWyuoOlSydwVVn95w/X0aR45noGYiGmlw
+eETlbIsFw9ci3mrUFbQ+IDNP0uUQahqJbSfDf2yjQ+vXCEkN9zW3h+N2T6RKIwjN
+EdtMO8dZ+lWdMDGCAawwggGoAgEBMFIwTTELMAkGA1UEBhMCSlAxETAPBgNVBAoM
 CGN0b3Iub3JnMRQwEgYDVQQLDAtEZXZlbG9wbWVudDEVMBMGA1UEAwwMaHR0cC1h
-Y2Nlc3MyAgEAMAkGBSsOAwIaBQCggbEwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEH
-ATAcBgkqhkiG9w0BCQUxDxcNMDcwNDI5MDA1NTA2WjAjBgkqhkiG9w0BCQQxFgQU
-7dnyG8eYGJMCbxFOqj+trGj6/dwwUgYJKoZIhvcNAQkPMUUwQzAKBggqhkiG9w0D
+Y2Nlc3MyAgEBMAkGBSsOAwIaBQCggbEwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEH
+ATAcBgkqhkiG9w0BCQUxDxcNMDcwOTExMTQwNjUwWjAjBgkqhkiG9w0BCQQxFgQU
+LDo4zNjnYqZsbuf5cQiMPYoKaq4wUgYJKoZIhvcNAQkPMUUwQzAKBggqhkiG9w0D
 BzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZI
-hvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYA8jASc7wiTM6dcogoMCs8n7rvS/5a9
-9DQgtaV2lQp3ZjbxmHzN/8KuaCXMTYmxd4kpCk/z/xuYTRJk1zRB5wHbxWeCqSw+
-Bagm6uvrW+QGlFuewia+vL8FI5tS1xDpQj+8H8XMgwx5tRCHKG0eTLGCEuBtbqeN
-TfBhCVMhdFhblg==
+hvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYBATRqB7vtE7yjSfNYaV6urEPN9ewKx
+VS7lZVuCWjbC7Yt2XIRMLWq+CgPy+FNfCGH6DIDzN6HnfsRuCSB25mTtInTopJAb
+hG5SpJ1GScCjmVoJIGXvXDejKQPo9rz2WK0ZEj7NRtpNyfv0BwG+bRozgq54Cnq/
+yNXneHi9dCn1KQ==
 
-------5D1564AD4B7AA41C792F4EA6897F9BBC--
+------8B5C3F7F4B46AC7A36EDE5247D3D6E76--
 

data/lib/httpclient/http.rb

@@ -196,14 +196,16 @@ class Message
 
     def dump(dev = '')
       set_header
+      str = nil
       if @is_request
-	dev << request_line
+	str = request_line
       else
-	dev << response_status_line
+	str = response_status_line
       end
-      dev << @header_item.collect { |key, value|
+      str += @header_item.collect { |key, value|
 	  dump_line("#{ key }: #{ value }")
 	}.join
+      dev << str
       dev
     end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: httpclient
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
-date: 2007-08-28 00:00:00 +09:00
+  version: 2.1.2
+date: 2007-09-22 00:00:00 +09:00
 summary: gives something like the functionality of libwww-perl (LWP) in Ruby
 require_paths: 
 - lib