also trust localhost

rack · Oct 1, 2011 · 96399d3 · 96399d3
1 parent 2bab9be
commit 96399d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/rack/request.rb b/lib/rack/request.rb
@@ -306,7 +306,7 @@ def accept_encoding
     end
 
     def trusted_proxy?(ip)
-      ip =~ /^127\.0\.0\.1$|^(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\.|^::1$|^fd[0-9a-f]{2}:.+/i
+      ip =~ /^127\.0\.0\.1$|^(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\.|^::1$|^fd[0-9a-f]{2}:.+|^localhost$/i
     end
 
     def ip

diff --git a/test/spec_request.rb b/test/spec_request.rb
@@ -815,6 +815,9 @@
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => 'other,unknown,192.168.0.1'
     res.body.should.equal 'unknown'
 
+    res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => 'unknown,localhost,192.168.0.1'
+    res.body.should.equal 'unknown'
+
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => '9.9.9.9, 3.4.5.6, 10.0.0.1, 172.31.4.4'
     res.body.should.equal '3.4.5.6'