diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2022-01-16 13:23:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-16 13:23:50 +0100 |
| commit | 8e84ebf0cb211c1d94145399b05c9f2ad0e4d4b0 (patch) | |
| tree | ebd30c6287a50f6b8c21700b8a3000c4f45070a1 /config/initializers | |
| parent | b52fdb4c6f28b6f09861f1bc856079bb60391055 (diff) | |
Remove IP tracking columns from users table (#16409)
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/devise.rb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 5232e6cfd..b434c68fa 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -1,11 +1,8 @@ require 'devise/strategies/authenticatable' Warden::Manager.after_set_user except: :fetch do |user, warden| - if user.session_active?(warden.cookies.signed['_session_id'] || warden.raw_session['auth_id']) - session_id = warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'] - else - session_id = user.activate_session(warden.request) - end + session_id = warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'] + session_id = user.activate_session(warden.request) unless user.session_activations.active?(session_id) warden.cookies.signed['_session_id'] = { value: session_id, @@ -17,9 +14,13 @@ Warden::Manager.after_set_user except: :fetch do |user, warden| end Warden::Manager.after_fetch do |user, warden| - if user.session_active?(warden.cookies.signed['_session_id'] || warden.raw_session['auth_id']) + session_id = warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'] + + if session_id && (session = user.session_activations.find_by(session_id: session_id)) + session.update(ip: warden.request.remote_ip) if session.ip != warden.request.remote_ip + warden.cookies.signed['_session_id'] = { - value: warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'], + value: session_id, expires: 1.year.from_now, httponly: true, secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'), |