excon 0.65.0 → 0.66.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cc63ddad0f9af8192beff1525e1ebce8ec89a633aa6a8bc2aec53177a7f8a41
-  data.tar.gz: 0e8f295ee1570d333e0ce292d272a175c92cf37fcb415b32a60b2997b4f5d3cf
+  metadata.gz: 353be74596fc596f8436dac3da4ebaba40f006e4ad4973429cf25c6c54c41923
+  data.tar.gz: 156b667f3a4474033b115aa09818b3fba2288160aa7774c82459bb4708158264
 SHA512:
-  metadata.gz: 12669e9bef2f22834bbc6ac0292e16bcf1f9d87ca0e37b06d02e39183d25b2f7bd69389663d688e48b8edd1104f91c50146eb152d8e508840aafd0802169f379
-  data.tar.gz: b0d6abdbe9fdeb53a89ce96dca6315e5e61d2b66a64d5a326dfff711df5ce742fa3455c997c8b94d315a31ceb9bd5caa1186b414a7389687b312cbbc87607150
+  metadata.gz: 26a8d197845c79aa756b6b29adfa65e7b4f340eeb27b7beccc69605134d67f254b44198cb88f583f193ff0362a9601420689109f535a875f2cb32f30b2299fd2
+  data.tar.gz: 4d9672acc8e2e3fe657ebaebd00478583a39438d02d20535a315e6d02fc3b902923d8c26b7e8f113205b123071d01c414d71be5e35402573f4b994b5d3f4dab6

data/lib/excon/connection.rb

@@ -440,7 +440,7 @@ module Excon
       datum[:stack].response_call(datum)
     rescue => error
       case error
-      when Excon::Errors::HTTPStatusError, Excon::Errors::Timeout
+      when Excon::Errors::HTTPStatusError, Excon::Errors::Timeout, Excon::Errors::TooManyRedirects
         raise(error)
       else
         raise_socket_error(error)

data/lib/excon/constants.rb

@@ -12,6 +12,8 @@ module Excon
     CHUNK_SIZE = DEFAULT_CHUNK_SIZE
   end
 
+  DEFAULT_REDIRECT_LIMIT = 10
+
   DEFAULT_RETRY_LIMIT = 4
 
   DEFAULT_RETRY_ERRORS = [

data/lib/excon/error.rb

@@ -51,6 +51,7 @@ or:
     class Timeout < Error; end
     class ResponseParse < Error; end
     class ProxyParse < Error; end
+    class TooManyRedirects < Error; end
 
     # Base class for HTTP Error classes
     class HTTPStatus < Error

data/lib/excon/middlewares/mock.rb

@@ -26,11 +26,12 @@ module Excon
           end
 
           if stub = Excon.stub_for(datum)
+            datum[:remote_ip] ||= '127.0.0.1'
             datum[:response] = {
               :body       => '',
               :headers    => {},
               :status     => 200,
-              :remote_ip  => '127.0.0.1'
+              :remote_ip  => datum[:remote_ip]
             }
 
             stub_datum = case stub.last

data/lib/excon/middlewares/redirect_follower.rb

@@ -2,6 +2,18 @@
 module Excon
   module Middleware
     class RedirectFollower < Excon::Middleware::Base
+      def self.valid_parameter_keys
+        [
+          :redirects_remaining,
+          :redirect_limit
+        ]
+      end
+
+      def request_call(datum)
+        datum[:redirects_remaining] ||= datum[:redirect_limit] ||
+                                        Excon::DEFAULT_REDIRECT_LIMIT
+        @stack.request_call(datum)
+      end
 
       def get_header(datum, header)
         _, header_value = datum[:response][:headers].detect do |key, value|
@@ -14,14 +26,21 @@ module Excon
         if datum.has_key?(:response)
           case datum[:response][:status]
           when 301, 302, 303, 307, 308
+            if datum[:redirects_remaining] <= 0
+              raise Excon::Errors::TooManyRedirects
+            end
+
+            datum[:redirects_remaining] -= 1
+
             uri_parser = datum[:uri_parser] || Excon.defaults[:uri_parser]
 
             location = get_header(datum, 'Location')
             base_uri = Excon::Utils.request_uri(datum)
             uri = uri_parser.join(base_uri, location)
 
-            # delete old/redirect response
+            # delete old/redirect response and remote_ip
             response = datum.delete(:response)
+            datum.delete(:remote_ip)
 
             params = datum.dup
             params.delete(:connection)
@@ -52,7 +71,10 @@ module Excon
             params.merge!(:password => Utils.unescape_uri(uri.password)) if uri.password
 
             response = Excon::Connection.new(params).request
-            datum.merge!({:response => response.data})
+            datum.merge!({
+              :remote_ip  => response.remote_ip,
+              :response   => response.data
+            })
           else
             @stack.response_call(datum)
           end

data/lib/excon/socket.rb

@@ -125,6 +125,7 @@ module Excon
         end
 
         @remote_ip = ip
+        @data[:remote_ip] = ip
 
         # nonblocking connect
         begin

data/lib/excon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.65.0
+  version: 0.66.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec