Project

General

Profile

Feature #44578 » 0001-Invalidate-sessions-and-autologin-tokens-when-an-ema.patch

Jens Krämer, 2026-10-06 07:28

View differences:

app/controllers/application_controller.rb
end
end
# Issues a new session token after the session tokens of the current user
# were deleted, so that the current session stays valid.
# API requests do not use the session and thus do not need a token.
def renew_session_token
session[:tk] = User.current.generate_session_token unless api_request?
end
def user_setup
# Check the settings cache for each request
Setting.check_cache
app/controllers/email_addresses_controller.rb
def destroy
@address.destroy
if @user == User.current
# The session token was destroyed by the address deletion, generate a new one
renew_session_token
end
respond_to do |format|
format.html do
app/controllers/my_controller.rb
if request.put?
@user.safe_attributes = params[:user]
@user.pref.safe_attributes = params[:pref]
mail_changed = @user.mail_changed?
if @user.save
@user.pref.save
if mail_changed
# The session token was destroyed by the email address change, generate a new one
renew_session_token
end
respond_to do |format|
format.html do
flash[:notice] = l(:notice_account_updated)
......
@user.must_change_passwd = false
if @user.save
# The session token was destroyed by the password change, generate a new one
session[:tk] = @user.generate_session_token
renew_session_token
Mailer.deliver_password_updated(@user, User.current)
flash[:notice] = l(:notice_account_password_updated)
redirect_to my_account_path
app/controllers/twofa_controller.rb
def activate
if @twofa.confirm_pairing!(params[:twofa_code].to_s)
# The session token was destroyed by the twofa pairing, generate a new one
session[:tk] = @user.generate_session_token
renew_session_token
flash[:notice] = l('twofa_activated', bc_path: my_twofa_backup_codes_init_path)
redirect_to my_account_path
else
app/controllers/users_controller.rb
@user.safe_attributes = params[:user]
# Was the account actived ? (do it before User#save clears the change)
was_activated = (@user.status_change == [User::STATUS_REGISTERED, User::STATUS_ACTIVE])
mail_changed = @user.mail_changed?
# TODO: Similar to My#account
@user.pref.safe_attributes = params[:pref]
if @user.save
@user.pref.save
if mail_changed && @user == User.current
# The session token was destroyed by the email address change, generate a new one
renew_session_token
end
Mailer.deliver_password_updated(@user, User.current) if is_updating_password
if was_activated
Mailer.deliver_account_activated(@user)
app/models/email_address.rb
end
# Delete all outstanding password reset tokens on email change.
# Delete the autologin and session tokens as well to prohibit session leakage.
# This helps to keep the account secure in case the associated email account
# was compromised.
def destroy_tokens
if saved_change_to_address? || destroyed?
tokens = ['recovery']
Token.where(:user_id => user_id, :action => tokens).delete_all
user&.delete_login_tokens
end
end
app/models/user.rb
Token.where(:user_id => id, :action => 'autologin', :value => value).delete_all
end
# Deletes all tokens that could be used to log in
def delete_login_tokens
Token.where(:user_id => id, :action => ['recovery', 'autologin', 'session']).delete_all
end
def twofa_totp_key
read_ciphered_attribute(:twofa_totp_key)
end
......
# was compromised.
def destroy_tokens
if saved_change_to_hashed_password? || (saved_change_to_status? && !active?) || (saved_change_to_twofa_scheme? && twofa_scheme.present?)
tokens = ['recovery', 'autologin', 'session']
Token.where(:user_id => id, :action => tokens).delete_all
delete_login_tokens
end
end
test/integration/api_test/my_test.rb
assert_kind_of Array, json['errors']
end
test "PUT /my/account.json with a changed mail should not generate a session token" do
Token.create!(:user_id => 3, :action => 'session')
put(
'/my/account.json',
:params => {:user => {:mail => 'dave@somenet.foo'}},
:headers => credentials('dlopper', 'foo'))
assert_response :no_content
assert_equal 'dave@somenet.foo', User.find(3).mail
assert_empty Token.where(:user_id => 3, :action => 'session')
end
test "GET /my/account.json authenticated via OAuth should not disclose the api_key" do
application = Doorkeeper::Application.create!(
:name => 'Test App',
test/integration/api_test/users_test.rb
assert_equal '', @response.body
end
test "PUT /users/:id.json by an admin changing their own mail should not generate a session token" do
Token.create!(:user_id => 1, :action => 'session')
put(
'/users/1.json',
:params => {:user => {:mail => 'newadmin@somenet.foo'}},
:headers => credentials('admin'))
assert_response :no_content
assert_equal 'newadmin@somenet.foo', User.find(1).mail
assert_empty Token.where(:user_id => 1, :action => 'session')
end
test "PUT /users/:id.xml with invalid parameters" do
assert_no_difference('User.count') do
put(
test/integration/sessions_test.rb
assert_response :ok
end
def test_change_password_generates_a_new_token_for_current_session
def test_change_password_kills_all_sessions_and_generates_a_new_token_for_current_session
other_session_token = Token.create!(:user_id => 2, :action => 'session')
log_user('jsmith', 'jsmith')
assert_not_nil token = session[:tk]
......
)
assert_response :found
assert_not_equal token, session[:tk]
assert_nil Token.find_by(:user_id => 2, :action => 'session', :value => token)
assert_nil Token.find_by_id(other_session_token.id)
get '/my/account'
assert_response :ok
end
def test_change_mail_kills_sessions
log_user('jsmith', 'jsmith')
jsmith = User.find(2)
jsmith.mail = 'anotheraddress@somenet.foo'
jsmith.save!
get '/my/account'
assert_response :found
assert_includes flash[:error], 'Your session has expired'
end
def test_change_mail_kills_all_sessions_and_generates_a_new_token_for_current_session
other_session_token = Token.create!(:user_id => 2, :action => 'session')
log_user('jsmith', 'jsmith')
assert_not_nil token = session[:tk]
put '/my/account', :params => {:user => {:mail => 'anotheraddress@somenet.foo'}}
assert_response :found
assert_not_equal token, session[:tk]
assert_nil Token.find_by(:user_id => 2, :action => 'session', :value => token)
assert_nil Token.find_by_id(other_session_token.id)
get '/my/account'
assert_response :ok
end
def test_destroy_email_address_kills_all_sessions_and_generates_a_new_token_for_current_session
email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
other_session_token = Token.create!(:user_id => 2, :action => 'session')
log_user('jsmith', 'jsmith')
assert_not_nil token = session[:tk]
delete "/users/2/email_addresses/#{email.id}"
assert_response :found
assert_not_equal token, session[:tk]
assert_nil Token.find_by(:user_id => 2, :action => 'session', :value => token)
assert_nil Token.find_by_id(other_session_token.id)
get '/my/account'
assert_response :ok
end
def test_admin_destroying_other_users_email_address_should_not_touch_admin_session
email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
jsmith_session_token = Token.create!(:user_id => 2, :action => 'session')
log_user('admin', 'admin')
assert_not_nil token = session[:tk]
delete "/users/2/email_addresses/#{email.id}"
assert_response :found
assert_equal token, session[:tk]
assert_nil Token.find_by_id(jsmith_session_token.id)
get '/my/account'
assert_response :ok
end
def test_admin_changing_own_mail_kills_all_sessions_and_generates_a_new_token_for_current_session
other_session_token = Token.create!(:user_id => 1, :action => 'session')
log_user('admin', 'admin')
assert_not_nil token = session[:tk]
put '/users/1', :params => {:user => {:mail => 'newadmin@somenet.foo'}}
assert_response :found
assert_not_equal token, session[:tk]
assert_nil Token.find_by(:user_id => 1, :action => 'session', :value => token)
assert_nil Token.find_by_id(other_session_token.id)
get '/my/account'
assert_response :ok
end
def test_admin_changing_other_users_mail_should_kill_their_sessions_and_keep_admin_session
jsmith_session_token = Token.create!(:user_id => 2, :action => 'session')
log_user('admin', 'admin')
assert_not_nil token = session[:tk]
put '/users/2', :params => {:user => {:mail => 'anotheraddress@somenet.foo'}}
assert_response :found
assert_equal token, session[:tk]
assert_nil Token.find_by_id(jsmith_session_token.id)
get '/my/account'
assert_response :ok
test/integration/twofa_test.rb
def test_enable_twofa_should_destroy_tokens
recovery_token = Token.create!(:user_id => 2, :action => 'recovery')
autologin_token = Token.create!(:user_id => 2, :action => 'autologin')
other_session_token = Token.create!(:user_id => 2, :action => 'session')
with_settings twofa: "2" do
log_user('jsmith', 'jsmith')
assert_not_nil token = session[:tk]
follow_redirect!
assert_redirected_to "/my/twofa/totp/activate/confirm"
follow_redirect!
......
post "/my/twofa/totp/activate", params: {twofa_code: totp.now}
assert_redirected_to "/my/account"
assert_not_equal token, session[:tk]
assert_nil Token.find_by(:user_id => 2, :action => 'session', :value => token)
assert User.verify_session_token(2, session[:tk])
end
assert_nil Token.find_by_id(recovery_token.id)
assert_nil Token.find_by_id(autologin_token.id)
assert_nil Token.find_by_id(other_session_token.id)
end
end
test/unit/email_address_test.rb
User.current = nil
end
def test_destroy_should_destroy_tokens
email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
recovery_token = Token.create!(:user_id => 2, :action => 'recovery')
autologin_token = Token.create!(:user_id => 2, :action => 'autologin')
session_token = Token.create!(:user_id => 2, :action => 'session')
assert email.destroy
assert_nil Token.find_by_id(recovery_token.id)
assert_nil Token.find_by_id(autologin_token.id)
assert_nil Token.find_by_id(session_token.id)
end
def test_create_should_not_destroy_tokens
autologin_token = Token.create!(:user_id => 2, :action => 'autologin')
session_token = Token.create!(:user_id => 2, :action => 'session')
EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
assert_equal autologin_token, Token.find_by_id(autologin_token.id)
assert_equal session_token, Token.find_by_id(session_token.id)
end
def test_notify_change_should_not_destroy_tokens
email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
recovery_token = Token.create!(:user_id => 2, :action => 'recovery')
autologin_token = Token.create!(:user_id => 2, :action => 'autologin')
session_token = Token.create!(:user_id => 2, :action => 'session')
email.notify = false
assert email.save
assert_equal recovery_token, Token.find_by_id(recovery_token.id)
assert_equal autologin_token, Token.find_by_id(autologin_token.id)
assert_equal session_token, Token.find_by_id(session_token.id)
end
def test_destroy_address_of_missing_user_should_succeed
email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
EmailAddress.where(:id => email.id).update_all(:user_id => 999)
email.reload
assert email.destroy
assert_nil EmailAddress.find_by_id(email.id)
end
def test_address_with_punycode_tld_should_be_valid
email = EmailAddress.new(address: 'jsmith@example.xn--80akhbyknj4f')
assert email.valid?
test/unit/user_test.rb
def test_password_change_should_destroy_tokens
recovery_token = Token.create!(:user_id => 2, :action => 'recovery')
autologin_token = Token.create!(:user_id => 2, :action => 'autologin')
session_token = Token.create!(:user_id => 2, :action => 'session')
user = User.find(2)
user.password, user.password_confirmation = "a new password", "a new password"
......
assert_nil Token.find_by_id(recovery_token.id)
assert_nil Token.find_by_id(autologin_token.id)
assert_nil Token.find_by_id(session_token.id)
end
def test_mail_change_should_destroy_tokens
recovery_token = Token.create!(:user_id => 2, :action => 'recovery')
autologin_token = Token.create!(:user_id => 2, :action => 'autologin')
session_token = Token.create!(:user_id => 2, :action => 'session')
user = User.find(2)
user.mail = "user@somwehere.com"
assert user.save
assert_nil Token.find_by_id(recovery_token.id)
assert_equal autologin_token, Token.find_by_id(autologin_token.id)
assert_nil Token.find_by_id(autologin_token.id)
assert_nil Token.find_by_id(session_token.id)
end
def test_lock_should_destroy_tokens
recovery_token = Token.create!(:user_id => 2, :action => 'recovery')
autologin_token = Token.create!(:user_id => 2, :action => 'autologin')
session_token = Token.create!(:user_id => 2, :action => 'session')
user = User.find(2)
user.status = User::STATUS_LOCKED
assert user.save
assert_nil Token.find_by_id(recovery_token.id)
assert_nil Token.find_by_id(autologin_token.id)
assert_nil Token.find_by_id(session_token.id)
end
def test_twofa_activation_should_destroy_tokens
recovery_token = Token.create!(:user_id => 2, :action => 'recovery')
autologin_token = Token.create!(:user_id => 2, :action => 'autologin')
session_token = Token.create!(:user_id => 2, :action => 'session')
user = User.find(2)
user.twofa_scheme = 'totp'
assert user.save
assert_nil Token.find_by_id(recovery_token.id)
assert_nil Token.find_by_id(autologin_token.id)
assert_nil Token.find_by_id(session_token.id)
end
def test_change_on_other_fields_should_not_destroy_tokens
......
assert_equal autologin_token, Token.find_by_id(autologin_token.id)
end
def test_delete_login_tokens_should_delete_recovery_autologin_and_session_tokens
recovery_token = Token.create!(:user_id => 2, :action => 'recovery')
autologin_token = Token.create!(:user_id => 2, :action => 'autologin')
session_token = Token.create!(:user_id => 2, :action => 'session')
api_token = Token.create!(:user_id => 2, :action => 'api')
other_users_token = Token.create!(:user_id => 3, :action => 'session')
User.find(2).delete_login_tokens
assert_nil Token.find_by_id(recovery_token.id)
assert_nil Token.find_by_id(autologin_token.id)
assert_nil Token.find_by_id(session_token.id)
assert Token.find_by_id(api_token.id)
assert Token.find_by_id(other_users_token.id)
end
def test_validate_login_presence
@admin.login = ""
assert !@admin.save
    (1-1/1)