Merge pull request jaswope#26 from aderouineau/x_forwarded_for

Added X-Forwarded-For header in RoundTrip::set_forwarded_host()

Author: waterlink

lib/rack_reverse_proxy/middleware.rb

@@ -13,7 +13,7 @@ def initialize(app = nil, &b)
       @rules = []
       @global_options = {
         :preserve_host => true,
-        :x_forwarded_host => true,
+        :x_forwarded_headers => true,
         :matching => :all,
         :replace_response_host => false
       }

lib/rack_reverse_proxy/roundtrip.rb

@@ -89,8 +89,8 @@ def host_header
       "#{uri.host}:#{uri.port}"
     end
 
-    def set_forwarded_host
-      return unless options[:x_forwarded_host]
+    def set_forwarded_headers
+      return unless options[:x_forwarded_headers]
       target_request_headers["X-Forwarded-Host"] = source_request.host
       target_request_headers["X-Forwarded-Port"] = source_request.port.to_s
     end
@@ -178,7 +178,7 @@ def need_replace_location?
 
     def setup_request
       preserve_host
-      set_forwarded_host
+      set_forwarded_headers
       initialize_http_header
       set_basic_auth
       setup_body

spec/rack/reverse_proxy_spec.rb

@@ -92,6 +92,16 @@ def app
       ).to have_been_made
     end
 
+    it "sets the X-Forwarded-Port header to the proxying port by default" do
+      stub_request(:any, "example.com/test/stuff")
+      get "/test/stuff"
+      expect(
+        a_request(:get, "http://example.com/test/stuff").with(
+          :headers => { "X-Forwarded-Port" => "80" }
+        )
+      ).to have_been_made
+    end
+
     it "does not produce headers with a Status key" do
       stub_request(:get, "http://example.com/2test").to_return(
         :status => 301, :headers => { :status => "301 Moved Permanently" }
@@ -176,10 +186,10 @@ def app
       end
     end
 
-    describe "with x_forwarded_host turned off" do
+    describe "with x_forwarded_headers turned off" do
       def app
         Rack::ReverseProxy.new(dummy_app) do
-          reverse_proxy_options :x_forwarded_host => false
+          reverse_proxy_options :x_forwarded_headers => false
           reverse_proxy "/test", "http://example.com/"
         end
       end
@@ -194,6 +204,17 @@ def app
         ).not_to have_been_made
         expect(a_request(:get, "http://example.com/test/stuff")).to have_been_made
       end
+
+      it "does not set the X-Forwarded-Port header to the proxying port" do
+        stub_request(:any, "example.com/test/stuff")
+        get "/test/stuff"
+        expect(
+          a_request(:get, "http://example.com/test/stuff").with(
+            :headers => { "X-Forwarded-Port" => "80" }
+          )
+        ).not_to have_been_made
+        expect(a_request(:get, "http://example.com/test/stuff")).to have_been_made
+      end
     end
 
     describe "with timeout configuration" do