rack-proxy 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5728c44041f0dddc056d3ebc1b35e5429e3319115c07ade4e98278d02f5ffc2
-  data.tar.gz: 2d0a518195f43bb38557ab68c00c8bce11f234675fa1a4e1f242b3ce177d83f6
+  metadata.gz: 47505271ab54cee7d324c7fdd22c22ba7edae1b99146ee081913668925ff61f4
+  data.tar.gz: 74afa4cf47b33eba1e12a8a4b5f8b499237fa6a6fabacbb46c0bc820e627b07b
 SHA512:
-  metadata.gz: 353fc92d5a941f141f18f17d885506ff51098756687fcab816aa7e61fa5ace9e62a2658530c23d917f059d36db6585988f80d829a2818036f4f232d02436cf4e
-  data.tar.gz: 8874cf1e8ee86ad08db5b894ed9eb5e9975f1b43cf1c46e3b2422e720f57356b683a3c0782cd682435567506afeee690f90030e540b532a4c992b5724e9d820b
+  metadata.gz: 0ea871048c9cd7ceff7b13c7e59caad7d393947a9909e5372031cc51c85879d2e297b57c6245ea56dc7c104da3c5ed3bc5688e2ce7a8c006f68cba52c0ee1696
+  data.tar.gz: 1c3ee10747af4bc06e9a270ec21d1854f1112b82127940a198e075ee044c7be6e6c43847b83d5cfd6facfadd90a32e4260a2e8731665ced34d46ec7ffd2febc1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-proxy (0.8.1)
+    rack-proxy (0.8.3)
       rack
 
 GEM

data/lib/rack/proxy.rb

@@ -5,7 +5,7 @@ module Rack
 
   # Subclass and bring your own #rewrite_request and #rewrite_response
   class Proxy
-    VERSION = "0.8.1".freeze
+    VERSION = "0.8.3".freeze
 
     HOP_BY_HOP_HEADERS = {
       'connection' => true,
@@ -39,7 +39,9 @@ module Rack
       end
 
       def build_header_hash(pairs)
-        if Rack.const_defined?(:Headers)
+        # Pass inherit: false so we only check Rack's own constants — otherwise
+        # a top-level ::Headers defined by the host app would falsely match.
+        if Rack.const_defined?(:Headers, false)
           # Rack::Headers is only available from Rack 3 onward
           Headers.new.tap { |headers| pairs.each { |k, v| headers[k] = v } }
         else
@@ -126,7 +128,7 @@ module Rack
         target_request.body_stream    = source_request.body
         target_request.content_length = source_request.content_length.to_i
         target_request.content_type   = source_request.content_type if source_request.content_type
-        target_request.body_stream.rewind
+        target_request.body_stream.rewind if target_request.body_stream.respond_to?(:rewind)
       end
 
       # Use basic auth if we have to

data/test/rack_proxy_test.rb

@@ -120,6 +120,42 @@ class RackProxyTest < Test::Unit::TestCase
     end
   end
 
+  # An input stream that deliberately omits #rewind, mimicking
+  # Rackup::Handler::WEBrick::Input under Rack 3 (the Rack 3 SPEC no longer
+  # requires the input stream to respond to #rewind, only gets/each/read).
+  class NonRewindableInput
+    def initialize(string)
+      @io = StringIO.new(string)
+    end
+
+    def read(*args) = @io.read(*args)
+    def gets(*args) = @io.gets(*args)
+    def each(&block) = @io.each(&block)
+    # intentionally NO #rewind
+  end
+
+  # Issue #128: a non-rewindable body stream must not raise (it used to blow up
+  # with NoMethodError on #rewind, surfacing confusingly as a 500). The body
+  # must still be forwarded intact, since it is never read before Net::HTTP sends it.
+  def test_non_rewindable_body_is_forwarded_without_raising
+    with_webrick_proxy(streaming: false) do |port, proxy|
+      proxy.host = "127.0.0.1:#{port}"
+
+      body = NonRewindableInput.new("hello=world")
+      assert !body.respond_to?(:rewind), "fixture must not be rewindable to exercise the guard"
+
+      env = Rack::MockRequest.env_for("/echo-body", method: "POST")
+      env["rack.input"]     = body
+      env["CONTENT_LENGTH"] = "hello=world".bytesize.to_s
+      env["CONTENT_TYPE"]   = "text/plain"
+
+      status, _headers, response = nil
+      assert_nothing_raised { status, _headers, response = proxy.call(env) }
+      assert_equal 200, status.to_i
+      assert_equal "hello=world", response.to_a.join, "body must be forwarded intact"
+    end
+  end
+
   def test_response_header_included_Hop_by_hop
     app({:streaming => true}).host = 'mockapi.io'
     get 'https://example.com/oauth2/token/info?access_token=123'
@@ -250,6 +286,22 @@ class RackProxyTest < Test::Unit::TestCase
       "expected debug output to include request line, got: #{sink.string.inspect}")
   end
 
+  # Regression: build_header_hash must not match a top-level ::Headers
+  # constant defined by the host app (would happen with inherit: true).
+  def test_build_header_hash_ignores_toplevel_headers_constant
+    Object.send(:remove_const, :Headers) if Object.const_defined?(:Headers, false)
+    Object.const_set(:Headers, Class.new)
+    begin
+      result = Rack::Proxy.send(:build_header_hash, [['X-Test', 'value']])
+      # On Rack 3+ we get Rack::Headers; on Rack 2 we get Rack::Utils::HeaderHash.
+      # In neither case should we get the bogus top-level ::Headers.
+      assert_not_equal ::Headers, result.class,
+        "build_header_hash leaked into top-level ::Headers"
+    ensure
+      Object.send(:remove_const, :Headers)
+    end
+  end
+
   def test_no_logger_means_no_debug_output
     # Without a :logger option, Net::HTTP's set_debug_output should never be
     # called. We can't directly assert that, but we can confirm requests still
@@ -292,6 +344,7 @@ class RackProxyTest < Test::Unit::TestCase
       res['x-custom'] = 'value-here'
       res.body = 'ok'
     end
+    server.mount_proc('/echo-body')    { |req, res| res.body = req.body.to_s }
     Thread.new { server.start }
     port = server.config[:Port]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-proxy
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.3
 platform: ruby
 authors:
 - Jacek Becela