excon 0.15.1 → 0.15.2

data/changelog.txt

@@ -1,3 +1,15 @@
+0.15.2 07/16/12
+===============
+
+fix capitalization of EXCON constant in auth stuff
+properly handle nil user/password values in auth
+various fixes to proxy and related tests
+
+0.15.1 07/16/12
+===============
+
+fix for sending user/pass to proxy
+
 0.15.0 07/16/12
 ===============
 

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.15.1'
-  s.date              = '2012-07-16'
+  s.version           = '0.15.2'
+  s.date              = '2012-07-17'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/connection.rb

@@ -44,6 +44,11 @@ module Excon
 
       if @proxy
         @connection[:headers]['Proxy-Connection'] ||= 'Keep-Alive'
+        # https credentials happen in handshake
+        if @connection[:scheme] == 'http' && (@proxy[:user] || @proxy[:password])
+          auth = ['' << @proxy[:user].to_s << ':' << @proxy[:password].to_s].pack('m').delete(Excon::CR_NL)
+          @connection[:headers]['Proxy-Authorization'] = 'Basic ' << auth << Excon::CR_NL
+        end
       end
 
       if ENV.has_key?('EXCON_STANDARD_INSTRUMENTOR')
@@ -52,7 +57,7 @@ module Excon
 
       # Use Basic Auth if url contains a login
       if uri.user || uri.password
-        @connection[:headers]['Authorization'] ||= 'Basic ' << ['' << uri.user << ':' << uri.password].pack('m').delete(EXCON::CR_NL)
+        @connection[:headers]['Authorization'] ||= 'Basic ' << ['' << uri.user.to_s << ':' << uri.password.to_s].pack('m').delete(Excon::CR_NL)
       end
 
       @socket_key = '' << @connection[:host] << ':' << @connection[:port].to_s

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.15.1'
+    VERSION = '0.15.2'
   end
 
   unless const_defined?(:CHUNK_SIZE)

data/lib/excon/socket.rb

@@ -66,30 +66,6 @@ module Excon
         # this will be our last encountered exception
         raise exception
       end
-
-      initialize_proxy
-    end
-
-    def initialize_proxy
-      if @proxy
-        request = 'CONNECT ' << @params[:host] << ':' << @params[:port] << Excon::HTTP_1_1
-        request << 'Host: ' << @params[:host] << ':' << @params[:port] << Excon::CR_NL
-
-        if @proxy[:password] || @proxy[:user]
-          auth = ['' << @proxy[:user] << ':' << @proxy[:password]].pack('m').delete(EXCON::CR_NL)
-          request << "Proxy-Authorization: Basic " << auth << Excon::CR_NL
-        end
-
-        request << Excon::CR_NL
-
-        # write out the proxy setup request
-        @socket.write(request)
-
-        # eat the proxy's connection response
-        while line = @socket.readline.strip
-          break if line.empty?
-        end
-      end
     end
 
     def read(max_length=nil)

data/lib/excon/ssl_socket.rb

@@ -60,7 +60,25 @@ module Excon
       @socket = OpenSSL::SSL::SSLSocket.new(@socket, ssl_context)
       @socket.sync_close = true
 
-      initialize_proxy
+      if @proxy
+        request = 'CONNECT ' << @params[:host] << ':' << @params[:port] << Excon::HTTP_1_1
+        request << 'Host: ' << @params[:host] << ':' << @params[:port] << Excon::CR_NL
+
+        if @proxy[:password] || @proxy[:user]
+          auth = ['' << @proxy[:user].to_s << ':' << @proxy[:password].to_s].pack('m').delete(Excon::CR_NL)
+          request << "Proxy-Authorization: Basic " << auth << Excon::CR_NL
+        end
+
+        request << Excon::CR_NL
+
+        # write out the proxy setup request
+        @socket.write(request)
+
+        # 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

data/tests/proxy_tests.rb

@@ -170,6 +170,32 @@ Shindo.tests('Excon proxy support') do
         response.headers['Sent-Request-Uri']
       end
 
+      tests('sent Sent-Host header').returns('foo.com:8080') do
+        response.headers['Sent-Host']
+      end
+
+      tests('sent Proxy-Connection header').returns('Keep-Alive') do
+        response.headers['Sent-Proxy-Connection']
+      end
+
+      tests('response.body (proxied content)').returns('proxied content') do
+        response.body
+      end
+    end
+
+    tests('http proxying: http://user:pass@foo.com:8080') do
+      connection = Excon.new('http://foo.com:8080', :proxy => 'http://user:pass@127.0.0.1:9292')
+      response = connection.request(:method => :get, :path => '/bar', :query => {:alpha => 'kappa'})
+
+      tests('response.status').returns(200) do
+        response.status
+      end
+
+      # must be absolute form for proxy requests
+      tests('sent Request URI').returns('http://foo.com:8080/bar?alpha=kappa') do
+        response.headers['Sent-Request-Uri']
+      end
+
       tests('sent Host header').returns('foo.com:8080') do
         response.headers['Sent-Host']
       end

data/tests/rackups/proxy.ru

@@ -4,8 +4,9 @@ class App < Sinatra::Base
   get('/bar') do
     headers(
       "Sent-Request-Uri" => request.env['REQUEST_URI'].to_s,
-      "Sent-Host" => request.env['HTTP_HOST'].to_s,
-      "Sent-Proxy-Connection" => request.env['HTTP_PROXY_CONNECTION'].to_s
+      "Sent-Host" => request.env['HTTP_HOST'] || [request.env['SERVER_NAME'].to_s, request.env['SERVER_PORT']].join(':'),
+      "Sent-Proxy-Connection" => request.env['HTTP_PROXY_CONNECTION'].to_s,
+      "Env" => request.env.inspect
     )
     'proxied content'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70264814357400 !ruby/object:Gem::Requirement
+  requirement: &70180408821740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70264814357400
+  version_requirements: *70180408821740
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70264814356560 !ruby/object:Gem::Requirement
+  requirement: &70180408821180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70264814356560
+  version_requirements: *70180408821180
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70264814343520 !ruby/object:Gem::Requirement
+  requirement: &70180408820660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70264814343520
+  version_requirements: *70180408820660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70264814341220 !ruby/object:Gem::Requirement
+  requirement: &70180408820120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70264814341220
+  version_requirements: *70180408820120
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70264814340040 !ruby/object:Gem::Requirement
+  requirement: &70180408819600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70264814340040
+  version_requirements: *70180408819600
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &70264814337300 !ruby/object:Gem::Requirement
+  requirement: &70180408819140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70264814337300
+  version_requirements: *70180408819140
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70264814336620 !ruby/object:Gem::Requirement
+  requirement: &70180408818620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70264814336620
+  version_requirements: *70180408818620
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 581496622967967835
+      hash: -4082820160673762463
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: