Merge pull request #12 from jjthrash/master

Add support for X-Forwarded-Host header

Author: jaswope

lib/rack/reverse_proxy.rb

@@ -6,7 +6,7 @@ class ReverseProxy
     def initialize(app = nil, &b)
       @app = app || lambda {|env| [404, [], []] }
       @matchers = []
-      @global_options = {:preserve_host => true, :matching => :all, :verify_ssl => true}
+      @global_options = {:preserve_host => true, :x_forwarded_host => true, :matching => :all, :verify_ssl => true}
       instance_eval &b if block_given?
     end
 
@@ -24,7 +24,8 @@ def call(env)
         end
       }
       headers['HOST'] = uri.host if all_opts[:preserve_host]
- 
+      headers['X-Forwarded-Host'] = rackreq.host if all_opts[:x_forwarded_host]
+
       session = Net::HTTP.new(uri.host, uri.port)
       session.read_timeout=all_opts[:timeout] if all_opts[:timeout]
 

spec/rack/reverse_proxy_spec.rb

@@ -56,6 +56,12 @@ def app
       a_request(:get, 'http://example.com/test/stuff').with(:headers => {"Host" => "example.com"}).should have_been_made
     end
 
+    it "should set the X-Forwarded-Host header to the proxying host by default" do
+      stub_request(:any, 'example.com/test/stuff')
+      get '/test/stuff'
+      a_request(:get, 'http://example.com/test/stuff').with(:headers => {'X-Forwarded-Host' => 'example.org'}).should have_been_made
+    end
+
     describe "with preserve host turned off" do
       def app
         Rack::ReverseProxy.new(dummy_app) do
@@ -71,6 +77,22 @@ def app
       end
     end
 
+    describe "with x_forwarded_host turned off" do
+      def app
+        Rack::ReverseProxy.new(dummy_app) do
+          reverse_proxy_options :x_forwarded_host => false
+          reverse_proxy '/test', 'http://example.com/'
+        end
+      end
+
+      it "should not set the X-Forwarded-Host header to the proxying host" do
+        stub_request(:any, 'example.com/test/stuff')
+        get '/test/stuff'
+        a_request(:get, 'http://example.com/test/stuff').with(:headers => {'X-Forwarded-Host' => 'example.org'}).should_not have_been_made
+        a_request(:get, 'http://example.com/test/stuff').should have_been_made
+      end
+    end
+
     describe "with basic auth turned on" do
       def app
         Rack::ReverseProxy.new(dummy_app) do