hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819)

signup-info-prompt
Moritz Heiber 2019-01-15 23:11:46 +01:00 committed by Eugen Rochko
parent a12f6d10cc
commit ecf40d09ed
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/initializers/devise.rb
View File

@ -10,7 +10,6 @@ Warden::Manager.after_set_user except: :fetch do |user, warden|
expires: 1.year.from_now, expires: 1.year.from_now,
httponly: true, httponly: true,
secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'), secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'),
same_site: :lax,
} }
end end
@ -21,7 +20,6 @@ Warden::Manager.after_fetch do |user, warden|
expires: 1.year.from_now, expires: 1.year.from_now,
httponly: true, httponly: true,
secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'), secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'),
same_site: :lax,
} }
else else
warden.logout warden.logout

2
config/initializers/session_store.rb
View File

@ -1,3 +1,3 @@
# Be sure to restart your server when you modify this file. # Be sure to restart your server when you modify this file.
Rails.application.config.session_store :cookie_store, key: '_mastodon_session', secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'), same_site: :lax Rails.application.config.session_store :cookie_store, key: '_mastodon_session', secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true')

1
spec/rails_helper.rb
View File

@ -29,7 +29,6 @@ Devise::Test::ControllerHelpers.module_eval do
value: resource.activate_session(warden.request), value: resource.activate_session(warden.request),
expires: 1.year.from_now, expires: 1.year.from_now,
httponly: true, httponly: true,
same_site: :lax,
} }
end end
end end