edshot99/eBooru
1
0
Fork 0
forked from e621ng/e621ng
Code Issues 11 Releases 1 Activity

[Cookies] Hopefully fix Firefox defaulting to SameSite=none

Browse Source
This commit is contained in:
Kira 2020-07-02 17:23:16 -07:00
parent 54bff31894
commit 6fddcc7d58
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/logical/session_creator.rb
View File

@ -20,7 +20,7 @@ class SessionCreator
if remember
verifier = ActiveSupport::MessageVerifier.new(Danbooru.config.remember_key, serializer: JSON, hash: "SHA256")
cookies.encrypted[:remember] = {value: verifier.generate(user.id, purpose: "rbr", expires_in: 14.days), expires: Time.now + 14.days, httponly: true}
cookies.encrypted[:remember] = {value: verifier.generate(user.id, purpose: "rbr", expires_in: 14.days), expires: Time.now + 14.days, httponly: true, same_site: :lax, secure: Rails.env.production?}
end
return true
else

2
app/logical/session_loader.rb
View File

@ -71,7 +71,7 @@ private
def refresh_old_remember_token
if cookies.encrypted[:remember]
cookies.encrypted[:remember] = {value: @remember_validator.generate(CurrentUser.id, purpose: "rbr", expires_in: 14.days), expires: Time.now + 14.days, httponly: true}
cookies.encrypted[:remember] = {value: @remember_validator.generate(CurrentUser.id, purpose: "rbr", expires_in: 14.days), expires: Time.now + 14.days, httponly: true, same_site: :lax, secure: Rails.env.production?}
end
end

2
config/initializers/session_store.rb
View File

@ -1,4 +1,4 @@
# Be sure to restart your server when you modify this file.
Rails.application.config.session_store :cookie_store, key: '_danbooru_session'
Rails.application.config.session_store :cookie_store, key: '_danbooru_session', same_site: :lax, secure: Rails.env.production?
Rails.application.config.action_dispatch.cookies_same_site_protection = :lax