]> cat aescling's git repositories - mastodon.git/commitdiff
use host instead of headers to make Rack happy (#15741)
authorJustin Tracey <j2tracey@gmail.com>
Tue, 16 Feb 2021 14:28:17 +0000 (14:28 +0000)
committerGitHub <noreply@github.com>
Tue, 16 Feb 2021 14:28:17 +0000 (15:28 +0100)
"headers" is provided by Rails, Rack can't rely on it

lib/action_dispatch/cookie_jar_extensions.rb

index f7ffb6cc752bfba501cc8ddca034255b0922ef4b..492c04065d7f8ef042e666f1b2ad45a5f70aef71 100644 (file)
@@ -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