From: Justin Tracey <j2tracey@gmail.com>
Date: Tue, 16 Feb 2021 14:28:17 +0000 (+0000)
Subject: use host instead of headers to make Rack happy (#15741)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3f8523130da1029ba64d00c03360a2c15f85d9d6;p=mastodon.git

use host instead of headers to make Rack happy (#15741)

"headers" is provided by Rails, Rack can't rely on it
---

diff --git a/lib/action_dispatch/cookie_jar_extensions.rb b/lib/action_dispatch/cookie_jar_extensions.rb
index f7ffb6cc7..492c04065 100644
--- a/lib/action_dispatch/cookie_jar_extensions.rb
+++ b/lib/action_dispatch/cookie_jar_extensions.rb
@@ -7,7 +7,7 @@ module ActionDispatch
     # Monkey-patch ActionDispatch to serve secure cookies to Tor Hidden Service
     # users. Otherwise, ActionDispatch would drop the cookie over HTTP.
     def write_cookie?(*)
-      request.headers['Host'].ends_with?('.onion') || super
+      request.host.ends_with?('.onion') || super
     end
   end
 end
@@ -17,7 +17,7 @@ ActionDispatch::Cookies::CookieJar.prepend(ActionDispatch::CookieJarExtensions)
 module Rack
   module SessionPersistedExtensions
     def security_matches?(request, options)
-      request.headers['Host'].ends_with?('.onion') || super
+      request.host.ends_with?('.onion') || super
     end
   end
 end