rack-proxy 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9520dd879490c3e4e00d0617a74994fd178488878cf149f44acc4795975609e
-  data.tar.gz: 99c9ea6a98cbae6713c03f4ac4a6b87cf682a9189c073f29ecd5845d3ddc5c7e
+  metadata.gz: 40c24e4b559fc7669c3b675184af8d7f0b9ba693d3a7b41e6433274c16429adc
+  data.tar.gz: 6f8790c5c391e102275c11225a869e2572d109f2e52e4783cdc5cbbb50733579
 SHA512:
-  metadata.gz: f5b53e01fef046f99405006fcb5b60f053ede10fc23bb231ad27deebbe52593d1ad1fcd1ba77471dcb76405c65a9d7a3a685ed13caea6bdb1dbf927ad19ffffc
-  data.tar.gz: 940b3f2ba7a1248475799497e757a9a9be8875e933ef47b0fdc583181d0368804c56d0bd5b356860c169e4bdd9e68f2cfd6b7c6f273b9d542fd5bdd93b6e7f46
+  metadata.gz: 2885f787b2f08c712c99b938218749d7f5d35348588290414f058c446104e10ba80b7f0b439ea60c3fc4daea1a0b0f991c92e853a3a9de4ef238d5f864d85d20
+  data.tar.gz: 3f70b5ab5eee94517d10e82f72f517a7e4cd3fec346ba78142ed6d93bd34bb7d175f6e857c037c7b0beffd710889651f15d107920e38da7208bdc132f246f712

data/Gemfile.lock

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

data/README.md

@@ -43,6 +43,7 @@ Options can be set when initializing the middleware or overriding a method.
 * `:ssl_version` - tell `Net::HTTP` to set a specific `ssl_version`
 * `:backend` - the URI parseable format of host and port of the target proxy backend. If not set it will assume the backend target is the same as the source.
 * `:read_timeout` - set proxy timeout it defaults to 60 seconds
+* `:logger` - any object responding to `#<<` (e.g. `$stdout`, a `StringIO`, or a Ruby `Logger`). Wired through to `Net::HTTP#set_debug_output` so the full HTTP wire-level conversation is written to the sink. Useful for debugging.
 
 To pass in options, when you configure your middleware you can pass them in as an optional hash.
 

data/lib/rack/http_streaming_response.rb

@@ -10,7 +10,7 @@ module Rack
       304 => true
     }.freeze
 
-    attr_accessor :use_ssl, :verify_mode, :read_timeout, :ssl_version, :cert, :key
+    attr_accessor :use_ssl, :verify_mode, :read_timeout, :ssl_version, :cert, :key, :logger
 
     def initialize(request, host, port = nil)
       @request, @host, @port = request, host, port
@@ -61,6 +61,7 @@ module Rack
         http.ssl_version = ssl_version if ssl_version
         http.cert = cert if cert
         http.key = key if key
+        http.set_debug_output(logger) if logger
         http.start
       end
     end

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.0".freeze
+    VERSION = "0.8.2".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
@@ -83,6 +85,10 @@ module Rack
       @username = opts[:username]
       @password = opts[:password]
 
+      # Optional logger for Net::HTTP debug output. Accepts anything with a #<< method
+      # (e.g. $stdout, a StringIO, or a Ruby Logger instance).
+      @logger = opts[:logger]
+
       @opts = opts
     end
 
@@ -143,6 +149,7 @@ module Rack
           target_response.verify_mode = (@verify_mode || OpenSSL::SSL::VERIFY_PEER) if use_ssl
           target_response.cert = @cert if @cert
           target_response.key = @key if @key
+          target_response.logger = @logger if @logger
         else
           http = Net::HTTP.new(backend.host, backend.port)
           http.use_ssl = use_ssl if use_ssl
@@ -151,6 +158,7 @@ module Rack
           http.verify_mode = @verify_mode || OpenSSL::SSL::VERIFY_PEER if use_ssl
           http.cert = @cert if @cert
           http.key = @key if @key
+          http.set_debug_output(@logger) if @logger
 
           target_response = http.start do
             http.request(target_request)

data/test/rack_proxy_test.rb

@@ -226,6 +226,57 @@ class RackProxyTest < Test::Unit::TestCase
     assert last_response.ok?
   end
 
+  # Issue #80: a :logger option should pipe Net::HTTP debug output to the
+  # given sink (anything responding to #<<). We use a StringIO to capture it.
+  def test_logger_captures_request_in_non_streaming
+    sink = StringIO.new
+    with_webrick_proxy(streaming: false, logger: sink) do |port, proxy|
+      proxy.host = "127.0.0.1:#{port}"
+      get '/empty'
+      assert last_response.ok?
+    end
+    assert_match(/GET \/empty/, sink.string,
+      "expected debug output to include request line, got: #{sink.string.inspect}")
+  end
+
+  def test_logger_captures_request_in_streaming
+    sink = StringIO.new
+    with_webrick_proxy(streaming: true, logger: sink) do |port, proxy|
+      proxy.host = "127.0.0.1:#{port}"
+      get '/empty'
+      assert last_response.ok?
+    end
+    assert_match(/GET \/empty/, sink.string,
+      "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
+    # work when no logger is configured (covered by every other test).
+    with_webrick_proxy(streaming: false) do |port, proxy|
+      proxy.host = "127.0.0.1:#{port}"
+      get '/empty'
+      assert last_response.ok?
+    end
+  end
+
   private
 
   def assert_no_array_header_values(streaming:)
@@ -242,7 +293,7 @@ class RackProxyTest < Test::Unit::TestCase
 
   # Spin up a tiny WEBrick server with fixed routes so we can exercise the
   # proxy against real Net::HTTP requests without depending on a remote host.
-  def with_webrick_proxy(streaming:)
+  def with_webrick_proxy(**proxy_opts)
     require 'webrick'
     server = WEBrick::HTTPServer.new(
       Port: 0,
@@ -260,7 +311,7 @@ class RackProxyTest < Test::Unit::TestCase
     Thread.new { server.start }
     port = server.config[:Port]
 
-    proxy = HostProxy.new(streaming: streaming)
+    proxy = HostProxy.new(**proxy_opts)
     @app = proxy
     yield port, proxy
   ensure

metadata

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