excon 0.61.0 → 0.63.0

data/lib/excon/utils.rb

@@ -10,6 +10,12 @@ module Excon
     UNESCAPED = /([#{ Regexp.escape(CONTROL + ' ' + DELIMS + UNWISE + NONASCII) }])/
     ESCAPED   = /%([0-9a-fA-F]{2})/
 
+    def binary_encode(string)
+      if FORCE_ENC && string.encoding != Encoding::ASCII_8BIT
+        string.force_encoding('BINARY')
+      end
+    end
+
     def connection_uri(datum = @data)
       unless datum
         raise ArgumentError, '`datum` must be given unless called on a Connection'
@@ -21,6 +27,19 @@ module Excon
       end
     end
 
+    # Redact sensitive info from provided data
+    def redact(datum)
+      datum = datum.dup
+      if datum.has_key?(:headers) && datum[:headers].has_key?('Authorization')
+        datum[:headers] = datum[:headers].dup
+        datum[:headers]['Authorization'] = REDACTED
+      end
+      if datum.has_key?(:password)
+        datum[:password] = REDACTED
+      end
+      datum
+    end
+
     def request_uri(datum)
       connection_uri(datum) + datum[:path] + query_string(datum)
     end
@@ -59,7 +78,7 @@ module Excon
     def split_header_value(str)
       return [] if str.nil?
       str = str.dup.strip
-      str.force_encoding('BINARY') if FORCE_ENC
+      binary_encode(str)
       str.scan(%r'\G((?:"(?:\\.|[^"])+?"|[^",]+)+)
                     (?:,\s*|\Z)'xn).flatten
     end
@@ -67,21 +86,21 @@ module Excon
     # Escapes HTTP reserved and unwise characters in +str+
     def escape_uri(str)
       str = str.dup
-      str.force_encoding('BINARY') if FORCE_ENC
+      binary_encode(str)
       str.gsub(UNESCAPED) { "%%%02X" % $1[0].ord }
     end
 
     # Unescapes HTTP reserved and unwise characters in +str+
     def unescape_uri(str)
       str = str.dup
-      str.force_encoding('BINARY') if FORCE_ENC
+      binary_encode(str)
       str.gsub(ESCAPED) { $1.hex.chr }
     end
 
     # Unescape form encoded values in +str+
     def unescape_form(str)
       str = str.dup
-      str.force_encoding('BINARY') if FORCE_ENC
+      binary_encode(str)
       str.gsub!(/\+/, ' ')
       str.gsub(ESCAPED) { $1.hex.chr }
     end

data/lib/excon/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Excon
-  VERSION = '0.61.0'
+  VERSION = '0.63.0'
 end

data/lib/excon.rb

@@ -23,11 +23,11 @@ require 'excon/middlewares/instrumentor'
 require 'excon/middlewares/mock'
 require 'excon/middlewares/response_parser'
 
+require 'excon/error'
 require 'excon/constants'
 require 'excon/utils'
 
 require 'excon/connection'
-require 'excon/error'
 require 'excon/headers'
 require 'excon/response'
 require 'excon/middlewares/decompress'
@@ -61,6 +61,14 @@ module Excon
       if $VERBOSE || ENV['EXCON_DEBUG']
         $stderr.puts "[excon][WARNING] #{warning}\n#{ caller.join("\n") }"
       end
+
+      if @raise_on_warnings
+        raise Error::Warning.new(warning)
+      end
+    end
+
+    def set_raise_on_warnings!(should_raise)
+      @raise_on_warnings = should_raise
     end
 
     # Status of mocking

data/spec/excon/test/server_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Excon::Test::Server do
-  
+
   context 'when the web server is webrick' do
     it_should_behave_like "a excon test server", :webrick, 'basic.ru'
   end
@@ -23,6 +23,6 @@ describe Excon::Test::Server do
   end
 
   context 'when the web server is a executable' do
-    it_should_behave_like "a excon test server", :exec, 'good.rb'
+    it_should_behave_like "a excon test server", :exec, 'good_ipv4.rb'
   end
 end

data/spec/helpers/warning_helpers.rb

@@ -0,0 +1,9 @@
+def silence_warnings
+  orig_verbose = $VERBOSE
+  $VERBOSE = nil
+  Excon.set_raise_on_warnings!(false)
+  yield
+ensure
+  $VERBOSE = orig_verbose
+  Excon.set_raise_on_warnings!(true)
+end

data/spec/requests/unix_socket_spec.rb

@@ -1,25 +1,17 @@
 require "spec_helper"
 
 describe Excon::Connection do
+  include_context('stubs')
   context "when speaking to a UNIX socket" do
     context "Host header handling" do
       before do
-        responder = ->(req) do
+        Excon.stub do |req|
           {
             body: req[:headers].to_json,
             status: 200,
           }
         end
-
-        @original_mock = Excon.defaults[:mock]
-        Excon.defaults[:mock] = true
-        Excon.stub({}, responder)
-      end
-
-      after do
-        Excon.defaults[:mock] = @original_mock
       end
-
       it "sends an empty Host= by default" do
         conn = Excon::Connection.new(
           scheme: "unix",

data/spec/requests/validation_spec.rb

@@ -0,0 +1,80 @@
+describe Excon::Connection do
+  include_context('stubs')
+  describe 'validating parameters' do
+    class FooMiddleware < Excon::Middleware::Base
+      def self.valid_parameter_keys
+        [:foo]
+      end
+    end
+
+    let(:foo_stack) do
+      Excon.defaults[:middlewares] + [FooMiddleware]
+    end
+
+    def expect_parameter_warning(validation, key)
+      expect { yield }.to raise_error(Excon::Error::Warning, "Invalid Excon #{validation} keys: #{key.inspect}")
+    end
+
+    context 'with default middleware' do
+      it 'Connection.new warns on invalid parameter keys' do
+        expect_parameter_warning('connection', :foo) do
+          Excon.new('http://foo', :foo => :bar)
+        end
+      end
+
+      it 'Connection#request warns on invalid parameter keys' do
+        conn = Excon.new('http://foo')
+        expect_parameter_warning('request', :foo) do
+          conn.request(:foo => :bar)
+        end
+      end
+    end
+
+    context 'with custom middleware at instantiation' do
+      it 'Connection.new accepts parameters that are valid for the provided middleware' do
+        Excon.new('http://foo', :foo => :bar, :middlewares => foo_stack)
+      end
+
+      it 'Connection.new warns on parameters that are not valid for the provided middleware' do
+        expect_parameter_warning('connection', :bar) do
+          Excon.new('http://foo', :bar => :baz, :middlewares => foo_stack)
+        end
+      end
+
+      it 'Connection#request accepts parameters that are valid for the provided middleware' do
+        Excon.stub({}, {})
+        conn = Excon.new('http://foo', :middlewares => foo_stack)
+        conn.request(:foo => :bar)
+      end
+
+      it 'Connection#request warns on parameters that are not valid for the provided middleware' do
+        conn = Excon.new('http://foo', :middlewares => foo_stack)
+        expect_parameter_warning('request', :bar) do
+          conn.request(:bar => :baz)
+        end
+      end
+    end
+
+    context 'with custom middleware at request time' do
+      it 'Connection#request accepts parameters that are valid for the provided middleware' do
+        Excon.stub({}, {})
+        conn = Excon.new('http://foo')
+        conn.request(:foo => :bar, :middlewares => foo_stack)
+      end
+
+      it 'Connection#request warns on parameters that are not valid for the request middleware' do
+        conn = Excon.new('http://foo')
+        expect_parameter_warning('request', :bar) do
+          conn.request(:bar => :baz, :middlewares => foo_stack)
+        end
+      end
+
+      it 'Connection#request warns on parameters from instantiation that are not valid for the request middleware' do
+        conn = Excon.new('http://foo', :foo => :bar, :middlewares => foo_stack)
+        expect_parameter_warning('connection', :foo) do
+          conn.request(:middlewares => Excon.defaults[:middlewares])
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -15,6 +15,8 @@ RSpec.configure do |config|
   if config.files_to_run.one?
     config.default_formatter = 'doc'
   end
+
+  Excon.set_raise_on_warnings!(true)
 end
 
 # Load helpers

data/spec/support/shared_contexts/test_stub_context.rb

@@ -0,0 +1,11 @@
+shared_context "stubs" do 
+  before do
+    @original_mock = Excon.defaults[:mock]
+    Excon.defaults[:mock] = true
+  end
+
+  after do
+    Excon.defaults[:mock] = @original_mock
+    Excon.stubs.clear
+  end
+end

data/spec/support/shared_examples/shared_example_for_clients.rb

@@ -91,8 +91,10 @@ shared_examples_for 'a basic client' do |url = 'http://127.0.0.1:9292', opts = {
             data = []
             it 'yields with a chunk, remaining length, and total length' do
               expect do
-                conn.request(method: :get, path: '/content-length/100') do |chunk, remaining_length, total_length|
-                  data = [chunk, remaining_length, total_length]
+                silence_warnings do
+                  conn.request(method: :get, path: '/content-length/100') do |chunk, remaining_length, total_length|
+                    data = [chunk, remaining_length, total_length]
+                  end
                 end
               end.to_not raise_error
             end
@@ -163,6 +165,15 @@ shared_examples_for 'a basic client' do |url = 'http://127.0.0.1:9292', opts = {
             end
 
             context 'when a string is the body paramter' do
+              it 'does not change the enconding of the body' do
+                skip unless RUBY_VERSION >= '2.0'
+
+                string_body = '¥£€'
+                expect do
+                  conn.request(method: :post, path: '/echo', body: string_body)
+                end.to_not change { string_body.encoding }
+              end
+
               context 'without request_block' do
                 describe Excon::Response do
                   it "#body equals 'x' * 100)" do

data/tests/authorization_header_tests.rb

@@ -1,29 +1,27 @@
 Shindo.tests('Excon basics (Authorization data redacted)') do
-  with_rackup('basic_auth.ru') do
-    cases = [
-      ['user & pass', 'http://user1:pass1@foo.com/', 'Basic dXNlcjE6cGFzczE='],
-      ['email & pass', 'http://foo%40bar.com:pass1@foo.com/', 'Basic Zm9vQGJhci5jb206cGFzczE='],
-      ['user no pass', 'http://three_user@foo.com/', 'Basic dGhyZWVfdXNlcjo='],
-      ['pass no user', 'http://:derppass@foo.com/', 'Basic OmRlcnBwYXNz']
-    ]
-    cases.each do |desc,url,auth_header|
-      conn = nil
+  cases = [
+    ['user & pass', 'http://user1:pass1@foo.com/', 'Basic dXNlcjE6cGFzczE='],
+    ['email & pass', 'http://foo%40bar.com:pass1@foo.com/', 'Basic Zm9vQGJhci5jb206cGFzczE='],
+    ['user no pass', 'http://three_user@foo.com/', 'Basic dGhyZWVfdXNlcjo='],
+    ['pass no user', 'http://:derppass@foo.com/', 'Basic OmRlcnBwYXNz']
+  ]
+  cases.each do |desc,url,auth_header|
+    conn = nil
 
-      test("authorization header concealed for #{desc}") do
-        conn = Excon.new(url)
-        !conn.inspect.include?(auth_header)
-      end
-
-      if conn.data[:password]
-        test("password param concealed for #{desc}") do
-          !conn.inspect.include?(conn.data[:password])
-        end
-      end
+    test("authorization header concealed for #{desc}") do
+      conn = Excon.new(url)
+      !conn.inspect.include?(auth_header)
+    end
 
-      test("password param remains correct for #{desc}") do
-        conn.data[:password] == URI.parse(url).password
+    if conn.data[:password]
+      test("password param concealed for #{desc}") do
+        !conn.inspect.include?(conn.data[:password])
       end
+    end
 
+    test("password param remains correct for #{desc}") do
+      conn.data[:password] == URI.parse(url).password
     end
+
   end
 end

data/tests/bad_tests.rb

@@ -2,6 +2,28 @@ Shindo.tests('Excon bad server interaction') do
 
   with_server('bad') do
 
+    tests('header splitting') do
+
+      tests('prevents key splitting').raises(Excon::Errors::InvalidHeaderKey) do
+        connection = Excon.new('http://127.0.0.1:9292')
+        connection.request(
+          headers: { "Foo\r\nBar" => "baz" },
+          method:  :get,
+          path: '/echo'
+        )
+      end
+
+      tests('prevents value splitting').raises(Excon::Errors::InvalidHeaderValue) do
+        connection = Excon.new('http://127.0.0.1:9292')
+        connection.request(
+          headers: { Foo: "bar\r\nBaz: qux" },
+          method:  :get,
+          path: '/echo'
+        )
+      end
+
+    end
+
     tests('bad server: causes EOFError') do
 
       tests('with no content length and no chunking') do

data/tests/batch_requests.rb

@@ -1,7 +1,7 @@
 require 'shindo'
 
 Shindo.tests('Batch Requests') do
-  with_server('good') do
+  with_server('good_ipv4') do
     tests('with batch request size 2') do
       returns(%w{ 1 2 1 2 }, 'batch request size 2') do
         connection = Excon.new('http://127.0.0.1:9292')

data/tests/complete_responses.rb

@@ -1,7 +1,7 @@
 Shindo.tests('Excon Response Validation') do
   env_init
 
-  with_server('good') do
+  with_server('good_ipv4') do
     tests('good responses with complete headers') do
         100.times do
           res = Excon.get('http://127.0.0.1:9292/chunked/simple')

data/tests/data/127.0.0.1.cert.crt

@@ -1,20 +1,17 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----

data/tests/data/127.0.0.1.cert.key

@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpgIBAAKCAQEA/PbsbAxwowMioOR4UGR/tDF4ul6TZSKtiYxYqe+xEhlgLzS7
-/9mQibkJAz2EKNNd+DR8XnkvB84WNWyLDNeq1de3vZCgmN9W1oddoxbhNGKLSN6K
-mBxANaJzpbYHBHKJhErqGYeBoBf135UF2hVh7oU9n4P5ozdnjpx3IlNh6coDwNmu
-GkpfGftL2UbOZOBuXM7E0mtOlTUTg3OFtvITBcXf1iFNcLI9KrtEkvVsC3iHEis8
-3y0V4sPSPxl+UYJI44XowjIQ9hxs2616GvITep2m/ydTnjwu/wn5OSnyNNRV+jEY
-zDfCSQ7MZxoLDm05RVRZJY1hJwizaP7Na2pNuQIDAQABAoIBAQCFqd+Q1B3sNKrm
-gvKD4CaOSxm0uGZ/qQwzQuJSoOFaY+gr6VxxOz+hVhFKEgY0IENl9C3HKZdNM3sO
-rZTnq0mMhtiCpNoHDPPwlURH+b3zlSJt1ZE8AKl47abX58/bbL33FjKOXMiElESJ
-6E9YRbYid2rxT6XntU3V0B0vGQoConvcGN+6jtTvZInTLU+tuQTfw/GpB7AJcTej
-I2/gWx1lQurfv5iGcOqwPOoLN7qMWGsXbFxEFgmD1VN3AiCPV/A+gq8xf2wccws9
-dNwqz1sbphbR1nl0gUwWP3PRQa31RqgOsGLj2EFtBqZio8zzyNN6WLbVSMZfiDUi
-NIplFH6BAoGBAP/S5VKYkHCBJ+2QC9v42Bb8Ip6QC1oh+Sdm5geZuB72+xIWa6+1
-7Vw6DW+wDvEEDRICcl38iI60hq+H3TZRa35daDlUXEy66HNWwCxA//l+48Jvcx0x
-03qQDeB3PZqewsbey+aL23Tli8Kl2g9njzjUgi7tSbTEwWTlmNdElTnRAoGBAP0j
-hguvZNitFd0ScyHUr2VduWEPgsYVHcvzbUZ+UGga0zr2gfYwkVBiF7MZ2BqGWg0/
-ZNzmmlgLyk2sBhqN5B/8qjyJ3uvolstkj6vuwIyXa9Z4tAhy4SBtvwaLT19ZS+Y6
-EGnC1vdsyBypwxoet+uVs5KkFOUt6YD8upSq6udpAoGBAPLKPqYy8PI1QaWuzfKI
-qty1kk2WO4/hKkuA1tNjymBo2kOCT9VE/e5HkjTrjGKlC5qKA+y7HQcCwciZUxKY
-F0Kod5/hNnAD+1Rrgpr9XXJ2QMZpa4DLpv9s9B6STD8QaZ7AGBfHqBG7QPcM3HU+
-Pakb1imfPhJ3oWuWk4XKKy3hAoGBAOh7YJeIvOiWhhbj4+M1LuS8oA15LlR3fkca
-SMjOJ1CFGmvzi0YsMrkNbdCqMqOhskCqcRrDmwqzwVd2XqCyocmSxlIVGSu2EA+6
-SozQF/zG8F4nushroUCkKiV7eikKnL9TolFPhRf1yw8wBiQOBEIT2bkagqo8cVBq
-S31QP67JAoGBALWqrYJlU4SPW0uKAjRxHguUIyK1G1ezQjHq6kPaC2pnUkcReABZ
-KHKx+ZKkdO+y0itpTcxx1wKq7Uf8NH2rc2QWXNGeJajgt6V10dZbz6K6cVxeP+KV
-XqAxKDMfbUjqZqCBsEY+FOKoIMiCTqjvy9NIFDuvXT7Bs24FlQkjQPG8
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCcxLPBrn4oOjnQ
+QGinoreRpzlxU4q23C44Un8qMHUxQmPgUWIYq3M/CE03+oT6siiF1eiwktv0hx1I
+ocEunwe7v2YZnAZFgu5pBZFoKuNS3Dy7HAJ9GjqtvwICB2FBBYOrL0m/h+KFmSIK
+YGjRi/9AUeTySmZA7TTiC/355AjL9k089XZyu57uM/F2f4j1xNBaJNtK+ymtY/Gx
+ILFH3wFpQEAEftEnxxpK/7hRQN680Ymo0liPjnAmJXKME1noTTUZS7ZDHFnt3XJ0
+Pjma2iaHuz4MhkOnvnS5CwEZ/Y4oZisy50K1n9lQQIn5J5jA6CuYr/Nc+syTp1Ka
+7gl0QV3dAgMBAAECggEAfTtBIaqDyxzgTDT3pVp97BO69oW3HOZ84a89OHWnWKdh
+Y7N/epeTo7m8/cfZbO7fIjLEBDH9FbTNttTInraZleiK5lBWTjcOvsSc6KrCF9Ip
+jYsNjeRjFaKtNvOwRCHkkd5fumoRkYnHwKRNd3+vczE4hDjcwGb9RMoxo+r+//bM
+eESn+D6edk7ZgcE28fRbMpvDrFJ/dXd21JJKXsu2yIHntUPbmsQ7Ya0KPcwoOwfm
+uQNwDsNqsaFLGgpfO4vTEpuWsAeex/u+0YsDHoRH6TqIDkpXFYfVaqSRPnkS6jsL
+OK+/PGhfABZJU743u4GFeMIzEJxxpIA9vjypcHUDYQKBgQDOywWK8PBeRUMU+Hyc
+gJ+vbb3MLnyr0nekYRgGnq8ph+739aGcP1oADJwfs25tSg4t1srLluwuxCtvP3im
+SF9U6znJMiyrFbvKkCpBTkHdzJyiUrSbCUv2P/IktNYaehn9WA6mXYaz7uaxZ/ED
+/WtHJYqZHA/thdi1f7df9YqvmQKBgQDCEmIlfKCavd94CVNVmBiwIPMOEwCDwKZs
+lA+xlaRA/fHEL9f0oJq5ca1NP+Fs9V3ISIe1kOhFea7NjEruglNY9nvGn69hyBrQ
+22E2T2KREIEoWFZVgZjrQsQFot4lUGl7YqDn0tdRAWy7ykaFEYY1LOyF8NLXV8Wi
+elqedTra5QKBgHOWV4rKEhEfddeK7VwtKRTNqoEumtEP24AuJVfN6uqz6IcA7UyA
+vLW6VqoBiX/dHP/SR5h0y594Vy7fs3h+i4rT0ID9Yqpeg5E98+B89aQccpDo2bqu
+/56tL5QE4If8J/rL9aRYMqrwplITX0xzojsqaMYcQWrqna8VrFIe1V5BAoGALuBt
+4Iwn5vix/7aQ8H3aiMCMtPuWBj0EdfmViNmSYTh1q2O7EBWzCdQRfjVN6BmkW3pZ
+fVvRHubzeCbI+q90Hmr7HtD3dfD1uTkkVA/8yPlpmSstP14cZ8cqvgnHCtBPikQa
+haSB6ckkUH/dZMsE1ddSElBHPUiwLjzLorbCTpkCgYAZcGUbVGUBHYtNEf1vhY75
+7qeuDbxlwxEX8D6HEJ0L6GpFgp6e/2IhzfgGJCW7gcbQHDwBixPva/ybvAsR64jG
+c5n/TNguSv+JjpLZVl7MKmh4JssnEefBXT/LiSsz7LHeRm+SxxQptmsTYR5ODA8w
+E1w/yHz1wrIocfCyb1J5+w==
+-----END PRIVATE KEY-----

data/tests/data/excon.cert.crt

@@ -1,20 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIIDRTCCAi2gAwIBAgIJAMaDk10V/YquMA0GCSqGSIb3DQEBCwUAMCAxDjAMBgNV
-BAMTBWV4Y29uMQ4wDAYDVQQKEwVleGNvbjAeFw0xNzA5MDUxOTQzMzBaFw0xODA5
-MDUxOTQzMzBaMCAxDjAMBgNVBAMTBWV4Y29uMQ4wDAYDVQQKEwVleGNvbjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMWedu1HHibgTE5vxcA826vtlgDM
-KEYN7NPSkhH+ZjDz/nWZ7Y7DcDcNIsW3Nd53PsUGwva6FnBk0j/2GAwm+QO4bjHo
-UzB2O4rkePsrhrAOtGq9uINKmcAS0y9Ptl/ZTv1QsKUi4lKjDoalyHV8mEohpWNl
-9uWO0aN+Q2KNd4p0SHmlNGAZk9BiiRvPJJqenZ2D51MbJdH5O3N9FhLnwIK6eVaU
-R/a3lf5hdkyGYi39zpGx47VG/6q9is1t+WXBWaaLdU0omDhlH281kq+HaV3akG6k
-Kh70xFGXU9Ya7qwR+PA+WkGJO6z88qwESRpGZfSSBklpM0+qIbYOP7Zb9PMCAwEA
-AaOBgTB/MB0GA1UdDgQWBBTMRFBCu23CeR4YBGR9+2h2b6xqODBQBgNVHSMESTBH
-gBTMRFBCu23CeR4YBGR9+2h2b6xqOKEkpCIwIDEOMAwGA1UEAxMFZXhjb24xDjAM
-BgNVBAoTBWV4Y29uggkAxoOTXRX9iq4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQsFAAOCAQEAWU6Q11wZFK6GhYK85IkW90FHug8/13DRJ3Q041ttQEpR48DW1lgj
-5861hzKkYfyudJhk97WEnx2pzsZSogbiGv/jMT1otKk8RqQG/sQy/bqoTVZEg7I2
-FyPCMV4fPFCm2dL7NTh51q0xeb9QFkxNFQ7YGtAvPSxs+GM/8gLxs4pSPMLSCNxX
-0r6Lvook0ur+WXalGLu8110bCa4k+00SlZg0qZISlfrZyF5ofybylMjyy/qArgUy
-8eltHfWbPhJEqf1yDPz2xCYGGCSplJMpvAhvSf4GSM55B27AoPlYlaS5wEaJf8Ft
-g72ESuzICOQ617jOTeasIkkkoINIdnW1oA==
+MIICvDCCAaQCCQCS1Yn8FMcKlzANBgkqhkiG9w0BAQsFADAgMQ4wDAYDVQQDDAVl
+eGNvbjEOMAwGA1UECgwFZXhjb24wHhcNMTkwNDEyMTQzMTU2WhcNMjAwNDExMTQz
+MTU2WjAgMQ4wDAYDVQQDDAVleGNvbjEOMAwGA1UECgwFZXhjb24wggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCycrlh3FfPSv8kDJrvnRJwdFPUp+23juTD
+Pb8A7YBM1rw/z5WKJGhmdYAnhyhSO5KWuKH4dUTykNn0uFz0J5bXKclU6kjatM58
+IF96tc7kugDXCy+IBnmf2pM2fDrmji0c50abcHu70HQvxC+BQS9Id0iZ2G12q539
+lgxvSAquyh9NBhHhxW7aNUvPuueUVlfIKshd50aHtxWlMxr9hvOZzldj9C38du0Y
+uY+klTReMY2UCK2cm9S31QSP4gSeepGeaw6buV5pGNhiK9UR6dVVF4qFu21ZE0aN
+pNlCaBK8zCT5toxkgca096cKFOY6nfrhzhDdd2ULlRc/zpAkYuVRAgMBAAEwDQYJ
+KoZIhvcNAQELBQADggEBAIaZW9JnfhFhnq6bu0qo0HFrfEnpOhiMHIp2nyAoXdQI
+k/3Dxfd17LmfonQDkwo0D+tp3yu7xL2+qVIPElyWmKnhF13U4lhiGhAbMopV1dSH
+oUU5uk3DHfeWcTurC9PMX5MnozIaogmffkTEhXBOdaNI6vfk2Gs0tqYMGyIV2VNp
+KMegKCP2gX+PbqzXq6DzVCxbeDGdjKxpFQqas1W+soL/I9Hg7w/S8W9SpNP0tsfd
+JB7Xl2urXNK8HnsRt9uhwP6ZSIdtVqr62CqM2z0SvuTTdPTDn2TMGd0nHacpmqN0
+vUHeoZheUD+w8SikrQnr4/Ft3JrH0SKY0FlgVIGcaPg=
 -----END CERTIFICATE-----

data/tests/data/excon.cert.key

@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAxZ527UceJuBMTm/FwDzbq+2WAMwoRg3s09KSEf5mMPP+dZnt
-jsNwNw0ixbc13nc+xQbC9roWcGTSP/YYDCb5A7huMehTMHY7iuR4+yuGsA60ar24
-g0qZwBLTL0+2X9lO/VCwpSLiUqMOhqXIdXyYSiGlY2X25Y7Ro35DYo13inRIeaU0
-YBmT0GKJG88kmp6dnYPnUxsl0fk7c30WEufAgrp5VpRH9reV/mF2TIZiLf3OkbHj
-tUb/qr2KzW35ZcFZpot1TSiYOGUfbzWSr4dpXdqQbqQqHvTEUZdT1hrurBH48D5a
-QYk7rPzyrARJGkZl9JIGSWkzT6ohtg4/tlv08wIDAQABAoIBABpFHnocYh2442vp
-39fWPz1zr+UbPp9RapIeA9zwfJU1WjY36CR6RoiK7nxqBnc0UtvOMkyqICGAxZJL
-HJdA9wlPkxZ/U8+1Z+Tmyk5ZUuZEjidCYSzS1e16kyhO6GeFc8Ko31KUeJGTq3Kq
-xyMXFQeFwX6dJ10Mx0F8n2iSdbmpz6Sfz+L8RwUjlbi3m1iveeMqTk0V8ChTDluC
-RWLoUUAqOaV3YpaV4pHmpRJ9uMLbyC72t6JnbLdi5d/EY5vGmMDgsKg/pqW8omFO
-8kWo5riLncUyvEwSPoUyY12WWc3CnroacEJ7GoibuZYZwntwot+cWOkIZmnCbj+H
-OiBcDoECgYEA8ZgQmdlxQ5Fwe9sadDA3SYi2V/6bQNQkw54xkfsWd/PijIunVJI8
-cj/hVnbZL487DnJAXsLLygw048fSGwFZXmNbQUiXZaEIpa4t9DkgouGPvvuBp6TI
-uIjUF4aRKA4a3+MT4SNm74qXx8co5YXnE09KIMswZQ1YHjwIzV0ggJsCgYEA0Wce
-7poL7Xiyu1G1vr8vEbYtqelqHP28SzXkwrTqyOV8MPlw0/OhMDWmPLdE9mxSDwdD
-QAlPvvCWXhHEM/St5tN72mzuyodHjNsVnlPAckj6ADTTAmUO0fixHjivZ/6v+PEo
-SbjzmsbEExjyLKdScW8ALq3nfCdC9+Z3aTFShokCgYBbmz9gNtT9u94c+J11RPsR
-xObvQrl3wXkXO5qsMbr5TN6wUBvos3J8F8DH2lTL9dF8ztGdnNtNB4feftwqJT7P
-zXjCrlXJ0V/IAt2l5yt613B8CD3HZXI+lpNlQD82IvMJxb659YSIe9LFi7z0Guvd
-pIkFGkaFaqPpAvaLeC5k1QKBgGTqrZ2P3++yG3DrEAu9V5HRmnAobVtLbVNRxc2Q
-IxZugkuX6yg6YZQ6RsM8D6Ay09kqRt61nhkHGXB8X3IqmSSFB0tc9DfmujTH4MNM
-2ZI6WUGAM7ETwvCuSa2m4+HafDQdBK2C1OPiptwNSaj7el/wfsYASW8r/Lo795Ba
-lMsBAoGBAO8fKeu1cSrgNBG5Bafa5P2uPK1X9GASA1zgG6ay3FGH9m/vt36/DcRq
-LQQP1WJUH8AR9/jlUgpS134Ww0AFVVh/ZHZTFnVkS8mn6wzFehxt49uVVcJncRzB
-Vnes1S/Zky0RgvfR4rWy9NCYkIkqYAQPacfElxpGItV7V2INKFol
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCycrlh3FfPSv8k
+DJrvnRJwdFPUp+23juTDPb8A7YBM1rw/z5WKJGhmdYAnhyhSO5KWuKH4dUTykNn0
+uFz0J5bXKclU6kjatM58IF96tc7kugDXCy+IBnmf2pM2fDrmji0c50abcHu70HQv
+xC+BQS9Id0iZ2G12q539lgxvSAquyh9NBhHhxW7aNUvPuueUVlfIKshd50aHtxWl
+Mxr9hvOZzldj9C38du0YuY+klTReMY2UCK2cm9S31QSP4gSeepGeaw6buV5pGNhi
+K9UR6dVVF4qFu21ZE0aNpNlCaBK8zCT5toxkgca096cKFOY6nfrhzhDdd2ULlRc/
+zpAkYuVRAgMBAAECggEAcuhPGYYCgThAzRzU1ADn88Pki2ZLO8zm4BYtnVJSMKiB
+9fEc0SSamYeGK23r9+/md+mSWuRgrnW588yYBpxLlGeS/nwSx8pvwBw0f1b9T+m6
+Sr8oL0ZEITxlWUtrvjTFNfxzSfqHoqwbdPq2wFuSL+6nsHFeI3FlPfrWLP5N6rin
+TlUglesEiaPDu7mN+E7jM94MyXkMkiPPpxd8m04YULZNTj5OAk9HEWnRr0L1GaCr
+oc9n1k47sMzepiD6oKQRud4xijnVcI49L2hgSWSOm3dYREK7auCwCIcMx9m9Aa3N
+1NpnHAfIJP++HHSi4JRB3HegLHOOMG2B5mTOzfQPlQKBgQDbULpJtyDU6og5HkVC
+ViBkjIYGjfHeVeJxAEBCPyVszfUuGMImisYWiTAkC5bWiAsyyRoEpn1ro3e9pT/O
+N5LORuaMpwOP/WMbG/ShNmOg2v3nW2EWuiWOjf+Rpr+lxgKGI9Gpe7TcIGgR+Vsl
+/dCKEOjnFJzAVFt1A9zPdqpUkwKBgQDQTAcSCmKidhnz/scWDp272AwMaVA2OFfq
+yEup8CZiIh/LzdoMog+bsjMlZ7IbJznfx3yGxiWUq83HNfQ0cFcR1TjXY8rT6IYp
+5d5lKLMQiNdgt/ZhoJWCtKeYWx3LpJE+fPAUKIVC4BLd0O9U6z9iudKKyfEKwvWC
+G64SHm6RCwKBgDDifaOQvjC3VkXlCWsP54iCCh3L5e25FxA5Dhm2GZF3Fv9/ZUdS
+B3VefuyJ6MVI7bYUPUhsE+i6NyZ+fwpoOMDh7OHNGG4v/Lc+M/j7NpnUNmQraii2
+tUhhPmYo1O8Og+GCemlcuaOXVZssCbUeLi2YN1HKtmXoZ7pdcgqMWMshAoGAFZCZ
+dsuudIVnoHQzJlxzBhyS+sH4dPSWXY9JDhn3z1cbFZ2FQqOQnBzx4KCAtwDzo/Bi
+Ow3OnDrBPiue0cMDsKvzi5EgUZoUMchDoxN4nnCcY74H+wmGERck9sgQKKIsC10h
++eRMD6VlLqPP82m7kTwNySKpGuUeR88X0XZnGgsCgYB26Hpm7rUJY/sUCyEQxqW+
+Opt8vOBV0ipapFD7O7VKImz7wALKBs6oiQGr+AoN/YavIYbubnmzP8jSUoqeWzFR
+c4s3/sozur+1sbFqk/lJeSdvogY2CT4qgQx9OrZBynSWYldHig9HEeU5a56oh9vv
+Vns6XV2XQMGmvjg9yetRig==
+-----END PRIVATE KEY-----

data/tests/error_tests.rb

@@ -35,7 +35,7 @@ Shindo.tests('HTTPStatusError request/response debugging') do
       Excon.new('http://localhost', path: "foo\r\nbar: baz")
       false
     rescue => err
-      err.to_s.include? "foo\r\nbar: baz"
+      err.to_s.include?(RUBY_VERSION >= '2.6.0' ? 'foo\r\nbar: baz' : "foo\r\nbar: baz")
     end
   end
 

data/tests/instrumentors/logging_instrumentor_tests.rb

@@ -0,0 +1,28 @@
+require 'logger'
+
+Shindo.tests('logging instrumentor') do
+  env_init
+
+  tests("connection logger").returns(true) do
+    Excon.stub({:method => :get}, {body: 'body', status: 200})
+
+    log_path = "/tmp/excon_#{Time.now.to_i}.txt"
+    logger = Logger.new(log_path)
+    # omit datetime to simplify test matcher
+    logger.formatter = proc do |severity, datetime, progname, msg|
+      "#{msg}\n"
+    end
+
+    connection = Excon.new(
+      'http://127.0.0.1:9292',
+      instrumentor: Excon::LoggingInstrumentor,
+      logger: logger,
+      mock: true
+    )
+    response = connection.request(method: :get, path: '/logger')
+    File.readlines(log_path)[1..2] == [
+      "request: http://127.0.0.1/logger\n",
+      "response: body\n"
+    ]
+  end
+end

data/tests/middlewares/decompress_tests.rb

@@ -1,7 +1,7 @@
 Shindo.tests('Excon Decompress Middleware') do
   env_init
 
-  with_server('good') do
+  with_server('good_ipv4') do
 
     before do
       @connection ||= Excon.new(