Fix #2308 - Mongrel should use X-Forwarded-For

Mongrel puppet code uses REMOTE_ADDR to set the ip address which will
be use to authenticate the client access.
Since mongrel is always used in a proxy mode with Puppet, REMOTE_ADDR
is always the address of the proxy (usually 127.0.0.1), which defeats
the purpose.
With this changeset, the mongrel code now uses the X-Forwarded-For
HTTP header value if it is passed over the REMOTE_ADDR.

Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/spec/unit/network/http/mongrel/rest.rb b/spec/unit/network/http/mongrel/rest.rb
index 317fdaf8b..5a5d2cfec 100755
--- a/spec/unit/network/http/mongrel/rest.rb
+++ b/spec/unit/network/http/mongrel/rest.rb
@@ -152,6 +152,22 @@ describe "Puppet::Network::HTTP::MongrelREST" do
                 @handler.params(@request)[:ip].should == "ipaddress"
             end
 
+            it "should pass the client's provided X-Forwared-For value as the ip" do
+                @request.stubs(:params).returns("HTTP_X_FORWARDED_FOR" => "ipaddress")
+                @handler.params(@request)[:ip].should == "ipaddress"
+            end
+
+            it "should pass the client's provided X-Forwared-For first value as the ip" do
+                @request.stubs(:params).returns("HTTP_X_FORWARDED_FOR" => "ipproxy1,ipproxy2,ipaddress")
+                @handler.params(@request)[:ip].should == "ipaddress"
+            end
+
+            it "should pass the client's provided X-Forwared-For value as the ip instead of the REMOTE_ADDR" do
+                @request.stubs(:params).returns("REMOTE_ADDR" => "remote_addr")
+                @request.stubs(:params).returns("HTTP_X_FORWARDED_FOR" => "ipaddress")
+                @handler.params(@request)[:ip].should == "ipaddress"
+            end
+
             it "should use the :ssl_client_header to determine the parameter when looking for the certificate" do
                 Puppet.settings.stubs(:value).returns "eh"
                 Puppet.settings.expects(:value).with(:ssl_client_header).returns "myheader"