excon 0.7.0 → 0.7.1

data/excon.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'excon'
-  s.version           = '0.7.0'
-  s.date              = '2011-09-12'
+  s.version           = '0.7.1'
+  s.date              = '2011-09-13'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -91,6 +91,7 @@ Gem::Specification.new do |s|
     lib/excon/errors.rb
     lib/excon/response.rb
     lib/excon/socket.rb
+    lib/excon/ssl_socket.rb
     tests/basic_tests.rb
     tests/header_tests.rb
     tests/idempotent_tests.rb
@@ -101,6 +102,7 @@ Gem::Specification.new do |s|
     tests/rackups/query_string.ru
     tests/rackups/request_methods.ru
     tests/rackups/response_header.ru
+    tests/rackups/ssl.ru
     tests/rackups/thread_safety.ru
     tests/request_method_tests.rb
     tests/stub_tests.rb

data/lib/excon.rb

@@ -13,6 +13,7 @@ require 'excon/connection'
 require 'excon/errors'
 require 'excon/response'
 require 'excon/socket'
+require 'excon/ssl_socket'
 
 module Excon
   class << self

data/lib/excon/connection.rb

@@ -227,7 +227,11 @@ module Excon
   private
 
     def socket
-      sockets[@socket_key] ||= Excon::Socket.new(@connection, @proxy)
+      sockets[@socket_key] ||= if @connection[:scheme] == 'https'
+        Excon::SSLSocket.new(@connection, @proxy)
+      else
+        Excon::Socket.new(@connection, @proxy)
+      end
     end
 
     def sockets

data/lib/excon/constants.rb

@@ -1,12 +1,12 @@
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.7.0'
+    VERSION = '0.7.1'
   end
 
   unless const_defined?(:CHUNK_SIZE)
     CHUNK_SIZE = 1048576 # 1 megabyte
   end
-  
+
   unless const_defined?(:HTTP_VERBS)
     HTTP_VERBS = %w{connect delete get head options post put trace}
   end

data/lib/excon/socket.rb

@@ -10,73 +10,30 @@ module Excon
       @connection_params, @proxy = connection_params, proxy
       @read_buffer, @write_buffer = '', ''
 
+      @sockaddr = if @proxy
+        ::Socket.sockaddr_in(@proxy[:port], @proxy[:host])
+      else
+        ::Socket.sockaddr_in(@connection_params[:port], @connection_params[:host])
+      end
+
       @socket = ::Socket.new(::Socket::Constants::AF_INET, ::Socket::Constants::SOCK_STREAM, 0)
 
+      connect
+
+      @socket
+    end
+
+    def connect
       # nonblocking connect
-      if @proxy
-        sockaddr = ::Socket.sockaddr_in(@proxy[:port], @proxy[:host])
-      else
-        sockaddr = ::Socket.sockaddr_in(@connection_params[:port], @connection_params[:host])
-      end
       begin
-        @socket.connect_nonblock(sockaddr)
+        @socket.connect_nonblock(@sockaddr)
       rescue Errno::EINPROGRESS
         IO.select(nil, [@socket], nil, @connection_params[:connect_timeout])
         begin
-          @socket.connect_nonblock(sockaddr)
+          @socket.connect_nonblock(@sockaddr)
         rescue Errno::EISCONN
         end
       end
-
-      # ssl setup
-      if @connection_params[:scheme] == 'https'
-        # create ssl context
-        ssl_context = OpenSSL::SSL::SSLContext.new
-
-        if Excon.ssl_verify_peer
-          # turn verification on
-          ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
-
-          if Excon.ssl_ca_path
-            ssl_context.ca_path = Excon.ssl_ca_path
-          else
-            # use default cert store
-            store = OpenSSL::X509::Store.new
-            store.set_default_paths
-            ssl_context.cert_store = store
-          end
-        else
-          # turn verification off
-          ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        end
-
-        if @connection_params.has_key?(:client_cert) && @connection_params.has_key?(:client_key)
-          ssl_context.cert = OpenSSL::X509::Certificate.new(File.read(@connection_params[:client_cert]))
-          ssl_context.key = OpenSSL::PKey::RSA.new(File.read(@connection_params[:client_key]))
-        end
-
-        @socket = OpenSSL::SSL::SSLSocket.new(@socket, ssl_context)
-        @socket.sync_close = true
-
-        if @proxy
-          @socket << "CONNECT " << @connection_params[:host] << ":" << @connection_params[:port] << HTTP_1_1
-          @socket << "Host: " << @connection_params[:host] << ":" << @connection_params[:port] << CR_NL << CR_NL
-
-          # eat the proxy's connection response
-          while line = @socket.readline.strip
-            break if line.empty?
-          end
-        end
-      end
-
-      if @connection_params[:scheme] == 'https'
-        # verify connection
-        if Excon.ssl_verify_peer
-          @socket.post_connection_check(@connection_params[:host])
-        end
-      end
-
-      @socket
     end
 
     def read(max_length)

data/lib/excon/ssl_socket.rb

@@ -0,0 +1,73 @@
+module Excon
+  class SSLSocket < Socket
+
+    # backwards compatability for 1.8.x SSLSocket (which lack nonblock)
+    unless OpenSSL::SSL::SSLSocket.public_method_defined?(:connect_nonblock)
+
+      undef_method :connect
+      def connect
+        @socket.connect(@sockaddr)
+      end
+
+      undef_method :read
+      def_delegators(:@socket, :read, :read)
+
+      undef_method :write
+      def_delegators(:@socket, :write, :write)
+
+    end
+
+    def initialize(connection_params = {}, proxy = {})
+      super
+
+      # create ssl context
+      ssl_context = OpenSSL::SSL::SSLContext.new
+
+      if Excon.ssl_verify_peer
+        # turn verification on
+        ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+        if Excon.ssl_ca_path
+          ssl_context.ca_path = Excon.ssl_ca_path
+        else
+          # use default cert store
+          store = OpenSSL::X509::Store.new
+          store.set_default_paths
+          ssl_context.cert_store = store
+        end
+      else
+        # turn verification off
+        ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      if @connection_params.has_key?(:client_cert) && @connection_params.has_key?(:client_key)
+        ssl_context.cert = OpenSSL::X509::Certificate.new(File.read(@connection_params[:client_cert]))
+        ssl_context.key = OpenSSL::PKey::RSA.new(File.read(@connection_params[:client_key]))
+      end
+
+      @socket = OpenSSL::SSL::SSLSocket.new(@socket, ssl_context)
+      @socket.sync_close = true
+
+      if @proxy
+        @socket << "CONNECT " << @connection_params[:host] << ":" << @connection_params[:port] << HTTP_1_1
+        @socket << "Host: " << @connection_params[:host] << ":" << @connection_params[:port] << CR_NL << CR_NL
+
+        # eat the proxy's connection response
+        while line = @socket.readline.strip
+          break if line.empty?
+        end
+      end
+
+      # connect the new OpenSSL::SSL::SSLSocket
+      @socket.connect
+
+      # verify connection
+      if Excon.ssl_verify_peer
+        @socket.post_connection_check(@connection_params[:host])
+      end
+
+      @socket
+    end
+
+  end
+end

data/tests/basic_tests.rb

@@ -3,3 +3,9 @@ with_rackup('basic.ru') do
     basic_tests
   end
 end
+
+with_rackup('ssl.ru') do
+  Shindo.tests('Excon basics (ssl)') do
+    basic_tests('https://127.0.0.1:9443')
+  end
+end

data/tests/rackups/ssl.ru

@@ -0,0 +1,18 @@
+require 'openssl'
+require 'sinatra'
+require 'webrick'
+require 'webrick/https'
+
+class App < Sinatra::Base
+  get('/content-length/:value') do |value|
+    headers("Custom" => "Foo: bar")
+    'x' * value.to_i
+  end
+end
+
+Rack::Handler::WEBrick.run(App, {
+  :Port             => 9443,
+  :SSLCertName      => [["CN", WEBrick::Utils::getservername]],
+  :SSLEnable        => true,
+  :SSLVerifyClient  => OpenSSL::SSL::VERIFY_NONE
+})

data/tests/test_helper.rb

@@ -3,10 +3,10 @@ require 'bundler'
 
 Bundler.require(:default, :development)
 
-def basic_tests
+def basic_tests(url = 'http://127.0.0.1:9292')
   tests('GET /content-length/100') do
 
-    connection = Excon.new('http://127.0.0.1:9292')
+    connection = Excon.new(url)
     response = connection.request(:method => :get, :path => '/content-length/100')
 
     tests('response.status').returns(200) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-12 00:00:00 Z
+date: 2011-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: open4
@@ -112,6 +112,7 @@ files:
 - lib/excon/errors.rb
 - lib/excon/response.rb
 - lib/excon/socket.rb
+- lib/excon/ssl_socket.rb
 - tests/basic_tests.rb
 - tests/header_tests.rb
 - tests/idempotent_tests.rb
@@ -122,6 +123,7 @@ files:
 - tests/rackups/query_string.ru
 - tests/rackups/request_methods.ru
 - tests/rackups/response_header.ru
+- tests/rackups/ssl.ru
 - tests/rackups/thread_safety.ru
 - tests/request_method_tests.rb
 - tests/stub_tests.rb