mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-25 14:05:11 +01:00
use host instead of headers to make Rack happy (#15741)
"headers" is provided by Rails, Rack can't rely on it
This commit is contained in:
parent
9c273c2a59
commit
3f8523130d
@ -7,7 +7,7 @@ module ActionDispatch
|
|||||||
# Monkey-patch ActionDispatch to serve secure cookies to Tor Hidden Service
|
# Monkey-patch ActionDispatch to serve secure cookies to Tor Hidden Service
|
||||||
# users. Otherwise, ActionDispatch would drop the cookie over HTTP.
|
# users. Otherwise, ActionDispatch would drop the cookie over HTTP.
|
||||||
def write_cookie?(*)
|
def write_cookie?(*)
|
||||||
request.headers['Host'].ends_with?('.onion') || super
|
request.host.ends_with?('.onion') || super
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -17,7 +17,7 @@ ActionDispatch::Cookies::CookieJar.prepend(ActionDispatch::CookieJarExtensions)
|
|||||||
module Rack
|
module Rack
|
||||||
module SessionPersistedExtensions
|
module SessionPersistedExtensions
|
||||||
def security_matches?(request, options)
|
def security_matches?(request, options)
|
||||||
request.headers['Host'].ends_with?('.onion') || super
|
request.host.ends_with?('.onion') || super
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user