Support Forwarded header in #forwarded?

Related to #2011
sinatra · dentarg · Nov 18, 2024 · Nov 5, 2024 · Nov 8, 2024 · Nov 8, 2024
commit 4652ad260d89048a15bbd75c1e1f942531724979
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -63,7 +63,7 @@ def preferred_type(*types)
     alias secure? ssl?
 
     def forwarded?
-      get_header(Request::HTTP_X_FORWARDED_HOST)
+      !forwarded_authority.nil?
     end
 
     def safe?

diff --git a/test/request_test.rb b/test/request_test.rb
@@ -41,6 +41,14 @@ class RequestTest < Minitest::Test
     assert request.forwarded?
   end
 
+  it 'respects Forwarded header with host key' do
+    request = Sinatra::Request.new('HTTP_FORWARDED' => 'host=example.com')
+    assert request.forwarded?
+
+    request = Sinatra::Request.new('HTTP_FORWARDED' => 'for=192.0.2.60;proto=http;by=203.0.113.43')
+    refute request.forwarded?
+  end
+
   it 'respects X-Forwarded-Proto header for proxied SSL' do
     request = Sinatra::Request.new('HTTP_X_FORWARDED_PROTO' => 'https')
     assert request.secure?